media: usbtv: fix control-message timeouts

commit 536f561d871c5781bc33d26d415685211b94032e upstream.

The driver was issuing synchronous uninterruptible control requests
without using a timeout. This could lead to the driver hanging on
various user requests due to a malfunctioning (or malicious) device
until the device is physically disconnected.

The USB upper limit of five seconds per request should be more than
enough.

Fixes: f3d27f34fdd7 ("[media] usbtv: Add driver for Fushicai USBTV007 video frame grabber")
Fixes: c53a846c48f2 ("[media] usbtv: add video controls")
Cc: stable <stable@vger.kernel.org>     # 3.11
Signed-off-by: Johan Hovold <johan@kernel.org>
Acked-by: Lubomir Rintel <lkundrak@v3.sk>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c
index 68df16b3ce72030c0b566dc31f93a58d51a040b8..50a61143898b5421874edc7bfb51c3fbce95382a 100644 (file)
--- a/drivers/media/usb/usbtv/usbtv-core.c
+++ b/drivers/media/usb/usbtv/usbtv-core.c
@@ -56,7 +56,7 @@ int usbtv_set_regs(struct usbtv *usbtv, const u16 regs[][2], int size)
 
                ret = usb_control_msg(usbtv->udev, pipe, USBTV_REQUEST_REG,
                        USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                       value, index, NULL, 0, 0);
+                       value, index, NULL, 0, USB_CTRL_GET_TIMEOUT);
                if (ret < 0)
                        return ret;
        }

diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c
index 3668a04359e8004bc0ea5c89c91def7c28a568f1..7c23d82313a84e8ea9a71791b4c564d8c2d21c7b 100644 (file)
--- a/drivers/media/usb/usbtv/usbtv-video.c
+++ b/drivers/media/usb/usbtv/usbtv-video.c
@@ -720,7 +720,8 @@ static int usbtv_s_ctrl(struct v4l2_ctrl *ctrl)
                ret = usb_control_msg(usbtv->udev,
                        usb_rcvctrlpipe(usbtv->udev, 0), USBTV_CONTROL_REG,
                        USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                       0, USBTV_BASE + 0x0244, (void *)data, 3, 0);
+                       0, USBTV_BASE + 0x0244, (void *)data, 3,
+                       USB_CTRL_GET_TIMEOUT);
                if (ret < 0)
                        goto error;
        }
@@ -771,7 +772,7 @@ static int usbtv_s_ctrl(struct v4l2_ctrl *ctrl)
        ret = usb_control_msg(usbtv->udev, usb_sndctrlpipe(usbtv->udev, 0),
                        USBTV_CONTROL_REG,
                        USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                       0, index, (void *)data, size, 0);
+                       0, index, (void *)data, size, USB_CTRL_SET_TIMEOUT);
 
 error:
        if (ret < 0)