Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Message-ID: <b30648712504dedd388ac13100afc43beba9408a.camel@collabora.com>
Subject: Re: [PATCH v2] uvcvideo: Also validate buffers in BULK mode
From:   Nicolas Dufresne <nicolas.dufresne@collabora.com>
Reply-To: Nicolas Dufresne <nicolas.dufresne@collabora.com>
To:     Nicolas Dufresne <nicolas.dufresne@collabora.com>
Cc:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Date:   Mon, 09 Dec 2019 21:27:14 -0500
In-Reply-To: <20180605234607.5334-1-nicolas.dufresne@collabora.com>
References: <2206409.jVpTcjFX6j@avalon>
         <20180605234607.5334-1-nicolas.dufresne@collabora.com>
Organization: Collabora
Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature";
        boundary="=-HkFHyoWWDEa6/+RDlJ3A"
User-Agent: Evolution 3.34.1 (3.34.1-1.fc31) 
MIME-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


--=-HkFHyoWWDEa6/+RDlJ3A
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Le mardi 05 juin 2018 =C3=A0 19:46 -0400, Nicolas Dufresne a =C3=A9crit :
> Just like for ISOC, validate the decoded BULK buffer size when possible.
> This avoids sending corrupted or partial buffers to userspace, which may
> lead to application crash or run-time failure.
>=20
> Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>

Ping. That was a year and a half ago and still applies.

> ---
>  drivers/media/usb/uvc/uvc_video.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>=20
> diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uv=
c_video.c
> index aa0082fe5833..025ffac196f3 100644
> --- a/drivers/media/usb/uvc/uvc_video.c
> +++ b/drivers/media/usb/uvc/uvc_video.c
> @@ -1234,6 +1234,7 @@ static void uvc_video_next_buffers(struct uvc_strea=
ming *stream,
>  		*meta_buf =3D uvc_queue_next_buffer(&stream->meta.queue,
>  						  *meta_buf);
>  	}
> +	uvc_video_validate_buffer(stream, *video_buf);
>  	*video_buf =3D uvc_queue_next_buffer(&stream->queue, *video_buf);
>  }
> =20
> @@ -1258,10 +1259,8 @@ static void uvc_video_decode_isoc(struct urb *urb,=
 struct uvc_streaming *stream,
>  		do {
>  			ret =3D uvc_video_decode_start(stream, buf, mem,
>  				urb->iso_frame_desc[i].actual_length);
> -			if (ret =3D=3D -EAGAIN) {
> -				uvc_video_validate_buffer(stream, buf);
> +			if (ret =3D=3D -EAGAIN)
>  				uvc_video_next_buffers(stream, &buf, &meta_buf);
> -			}
>  		} while (ret =3D=3D -EAGAIN);
> =20
>  		if (ret < 0)
> @@ -1277,10 +1276,8 @@ static void uvc_video_decode_isoc(struct urb *urb,=
 struct uvc_streaming *stream,
>  		uvc_video_decode_end(stream, buf, mem,
>  			urb->iso_frame_desc[i].actual_length);
> =20
> -		if (buf->state =3D=3D UVC_BUF_STATE_READY) {
> -			uvc_video_validate_buffer(stream, buf);
> +		if (buf->state =3D=3D UVC_BUF_STATE_READY)
>  			uvc_video_next_buffers(stream, &buf, &meta_buf);
> -		}
>  	}
>  }
> =20

--=-HkFHyoWWDEa6/+RDlJ3A
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQSScpfJiL+hb5vvd45xUwItrAaoHAUCXe8CgwAKCRBxUwItrAao
HIEyAJ9yXWmn2r8r8bYHXCDj7K5+HQxowgCfetp84CzTiCBhwrv6Zo3hUGy23Tg=
=9o1v
-----END PGP SIGNATURE-----

--=-HkFHyoWWDEa6/+RDlJ3A--