linux-kernel - Re: [PATCH] media: usbtv: fix control-message timeouts

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 13 Jan 2020 19:15:56 +0100
From:   Lubomir Rintel <lkundrak@...sk>
To:     Johan Hovold <johan@...nel.org>,
        Mauro Carvalho Chehab <mchehab@...nel.org>
Cc:     linux-media@...r.kernel.org, linux-usb@...r.kernel.org,
        linux-kernel@...r.kernel.org, stable <stable@...r.kernel.org>
Subject: Re: [PATCH] media: usbtv: fix control-message timeouts

On Mon, 2020-01-13 at 18:18 +0100, Johan Hovold wrote:
> 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@...r.kernel.org>     # 3.11
> Cc: Lubomir Rintel <lkundrak@...sk>
> Signed-off-by: Johan Hovold <johan@...nel.org>

Acked-by: Lubomir Rintel <lkundrak@...sk>

Thank you,
Lubo

> ---
>  drivers/media/usb/usbtv/usbtv-core.c  | 2 +-
>  drivers/media/usb/usbtv/usbtv-video.c | 5 +++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c
> index 5095c380b2c1..ee9c656d121f 100644
> --- 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 3d9284a09ee5..b249f037900c 100644
> --- a/drivers/media/usb/usbtv/usbtv-video.c
> +++ b/drivers/media/usb/usbtv/usbtv-video.c
> @@ -800,7 +800,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;
>  	}
> @@ -851,7 +852,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)