media: fix zero-length USB control requests
Subsystems (6)
cover media: fix zero-length USB control requests
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Control transfers without a data stage are treated as OUT requests by the USB stack and should be using usb_sndctrlpipe(). Failing to do so will now trigger a warning.
This series fixes the three media drivers that got this wrong.
Johan
Johan Hovold (3):
media: gspca/gl860: fix zero-length control requests
media: gspca/sunplus: fix zero-length control requests
media: rtl28xxu: fix zero-length control request
drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 3 ++- drivers/media/usb/gspca/gl860/gl860.c | 4 ++-- drivers/media/usb/gspca/sunplus.c | 8 ++++++-- 3 files changed, 10 insertions(+), 5 deletions(-)
Signature · 1 line
2.26.3
PATCH 1/3 media: gspca/gl860: fix zero-length control requests
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Control transfers without a data stage are treated as OUT requests by the USB stack and should be using usb_sndctrlpipe(). Failing to do so will now trigger a warning.
Fix the gl860_RTx() helper so that zero-length control reads fail with an error message instead. Note that there are no current callers that would trigger this.
--- drivers/media/usb/gspca/gl860/gl860.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/usb/gspca/gl860/gl860.c +2 -2
@@ -561,8 +561,8 @@ int gl860_RTx(struct gspca_dev *gspca_dev, len, 400 + 200 * (len > 1));memcpy (pdata, gspca_dev->usb_buf, len); }else { - r =usb_control_msg (udev,usb_rcvctrlpipe (udev,0 ), - req, pref, val, index,NULL , len,400 ); +gspca_err (gspca_dev,"zero-length read request\n" ); + r = -EINVAL ; } }
Signature · 1 line
2.26.3
PATCH 2/3 media: gspca/sunplus: fix zero-length control requests
In reply to Johan HovoldThe direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Control transfers without a data stage are treated as OUT requests by the USB stack and should be using usb_sndctrlpipe(). Failing to do so will now trigger a warning.
Fix the single zero-length control request which was using the read-register helper, and update the helper so that zero-length reads fail with an error message instead.
--- drivers/media/usb/gspca/sunplus.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/media/usb/gspca/sunplus.c +6 -2
@@ -242,6 +242,10 @@ static void reg_r(struct gspca_dev *gspca_dev,gspca_err (gspca_dev,"reg_r: buffer overflow\n" );return ; } +if (len ==0 ) { +gspca_err (gspca_dev,"reg_r: zero-length read\n" ); +return ; + }if (gspca_dev->usb_err <0 )return ; ret = usb_control_msg(gspca_dev->dev,
@@ -250,7 +254,7 @@ static void reg_r(struct gspca_dev *gspca_dev,USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 ,/* value */ index, - len ? gspca_dev->usb_buf :NULL , len, + gspca_dev->usb_buf, len, 500);if (ret <0 ) {pr_err ("reg_r err %d\n" , ret);
@@ -727,7 +731,7 @@ static int sd_start(struct gspca_dev *gspca_dev)case MegaImageVI:reg_w_riv (gspca_dev,0xf0 ,0 ,0 );spca504B_WaitCmdStatus (gspca_dev); -reg_r (gspca_dev,0xf0 ,4 ,0 ); +reg_w_riv (gspca_dev,0xf0 ,4 ,0 );spca504B_WaitCmdStatus (gspca_dev);break ;default :
Signature · 1 line
2.26.3
PATCH 3/3 media: rtl28xxu: fix zero-length control request
In reply to Johan HovoldThe direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Control transfers without a data stage are treated as OUT requests by the USB stack and should be using usb_sndctrlpipe(). Failing to do so will now trigger a warning.
Fix the zero-length i2c-read request used for type detection by attempting to read a single byte instead.
--- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/usb/dvb-usb-v2/rtl28xxu.c +2 -1
@@ -612,8 +612,9 @@ static int rtl28xxu_read_config(struct dvb_usb_device *d)static int rtl28xxu_identify_state (struct dvb_usb_device *d,const char **name) {struct rtl28xxu_dev *dev =d_to_priv (d); +u8 buf[1 ];int ret; -struct rtl28xxu_req req_demod_i2c = {0x0020 ,CMD_I2C_DA_RD ,0 ,NULL }; +struct rtl28xxu_req req_demod_i2c = {0x0020 ,CMD_I2C_DA_RD ,1 , buf};dev_dbg (&d->intf->dev,"\n" );
Signature · 1 line
2.26.3
Re: [PATCH 3/3] media: rtl28xxu: fix zero-length control request
Quoted 25 lines · Johan Hovold
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Control transfers without a data stage are treated as OUT requests by the USB stack and should be using
usb_sndctrlpipe(). Failing to do so will now trigger a warning.Fix the zero-length i2c-read request used for type detection by attempting to read a single byte instead.
Reported-by [email protected]Fixes d0f232e823af ("[media] rtl28xxu: add heuristic to detect chip type")Cc [email protected] # 4.0Cc Antti Palosaari <[email protected]>Signed-off-by Johan Hovold <[email protected]>--- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/media/usb/dvb-usb-v2/rtl28xxu.c +0
-0
drivers/media/usb/dvb-usb-v2/rtl28xxu.c static int rtl28xxu_read_config(struct dvb_usb_device *d) · line 619
Quoted 9 lines
drivers/media/usb/dvb-usb-v2/rtl28xxu.c +2
-1@@ -612,8 +612,9 @@ static int rtl28xxu_read_config(struct dvb_usb_device *d)static int rtl28xxu_identify_state (struct dvb_usb_device *d,const char **name) {struct rtl28xxu_dev *dev =d_to_priv (d); +u8 buf[1 ];int ret; -struct rtl28xxu_req req_demod_i2c = {0x0020 ,CMD_I2C_DA_RD ,0 ,NULL }; +struct rtl28xxu_req req_demod_i2c = {0x0020 ,CMD_I2C_DA_RD ,1 , buf};dev_dbg (&d->intf->dev,"\n" );
As reported here
https://lore.kernel.org/r/[email protected]
this patch is causing the chip type to no longer be detected correctly, so please drop this one for now until this has been resolved.
Johan
Re: [PATCH 3/3] media: rtl28xxu: fix zero-length control request
Quoted 34 lines · Johan Hovold
Quoted 33 lines · Johan Hovold
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Control transfers without a data stage are treated as OUT requests by the USB stack and should be using
usb_sndctrlpipe(). Failing to do so will now trigger a warning.Fix the zero-length i2c-read request used for type detection by attempting to read a single byte instead.
Reported-by [email protected]Fixes d0f232e823af ("[media] rtl28xxu: add heuristic to detect chip type")Cc [email protected] # 4.0Cc Antti Palosaari <[email protected]>Signed-off-by Johan Hovold <[email protected]>--- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/media/usb/dvb-usb-v2/rtl28xxu.c +2
-1@@ -612,8 +612,9 @@ static int rtl28xxu_read_config(struct dvb_usb_device *d)static int rtl28xxu_identify_state (struct dvb_usb_device *d,const char **name) {struct rtl28xxu_dev *dev =d_to_priv (d); +u8 buf[1 ];int ret; -struct rtl28xxu_req req_demod_i2c = {0x0020 ,CMD_I2C_DA_RD ,0 ,NULL }; +struct rtl28xxu_req req_demod_i2c = {0x0020 ,CMD_I2C_DA_RD ,1 , buf};
Quoted 8 lines
drivers/media/usb/dvb-usb-v2/rtl28xxu.c static int rtl28xxu_read_config(struct dvb_usb_device *d) · line 619
Quoted 1 line
drivers/media/usb/dvb-usb-v2/rtl28xxu.c +0
-0dev_dbg (&d->intf->dev,"\n" );As reported here
https://lore.kernel.org/r/[email protected]
this patch is causing the chip type to no longer be detected correctly, so please drop this one for now until this has been resolved.
Looks like this one was applied to the media tree a couple of days after I sent this nonetheless.
Can you drop this one in favour of the v2 posted here:
https://lore.kernel.org/r/[email protected]
or do you want me to send an incremental fix instead?
Johan