Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b958dea8 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

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: f3d27f34 ("[media] usbtv: Add driver for Fushicai USBTV007 video frame grabber")
Fixes: c53a846c ("[media] usbtv: add video controls")
Cc: stable <stable@vger.kernel.org>     # 3.11
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Acked-by: default avatarLubomir Rintel <lkundrak@v3.sk>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 275316b6

drivers/media/usb/usbtv/usbtv-core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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,

		ret = usb_control_msg(usbtv->udev, pipe, USBTV_REQUEST_REG,

			USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

			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)

		if (ret < 0)

			return ret;

			return ret;

	}

	}

drivers/media/usb/usbtv/usbtv-video.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -800,7 +800,8 @@ static int usbtv_s_ctrl(struct v4l2_ctrl *ctrl) 
		ret = usb_control_msg(usbtv->udev,

		ret = usb_control_msg(usbtv->udev,

			usb_rcvctrlpipe(usbtv->udev, 0), USBTV_CONTROL_REG,

			usb_rcvctrlpipe(usbtv->udev, 0), USBTV_CONTROL_REG,

			USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

			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)

		if (ret < 0)

			goto error;

			goto error;

	}

	}
@@ -851,7 +852,7 @@ static int usbtv_s_ctrl(struct v4l2_ctrl *ctrl) 
	ret = usb_control_msg(usbtv->udev, usb_sndctrlpipe(usbtv->udev, 0),

	ret = usb_control_msg(usbtv->udev, usb_sndctrlpipe(usbtv->udev, 0),

			USBTV_CONTROL_REG,

			USBTV_CONTROL_REG,

			USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

			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:

error:

	if (ret < 0)

	if (ret < 0)