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

Unverified Commit bfc19ac4 authored by Benoit Sevens's avatar Benoit Sevens Committed by Michael Bestas
Browse files

UPSTREAM: USB: media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format 



This can lead to out of bounds writes since frames of this type were not
taken into account when calculating the size of the frames buffer in
uvc_parse_streaming.

Fixes: c0efd232 ("V4L/DVB (8145a): USB Video Class driver")
Signed-off-by: default avatarBenoit Sevens <bsevens@google.com>
Cc: stable@vger.kernel.org
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Bug: 378455392
(cherry picked from commit ecf2b43018da9579842c774b7f35dbe11b5c38dd)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I959a6374ba7adf021fc19da755f5c7611fef9b8c
parent 22a2a28e

drivers/media/usb/uvc/uvc_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ static int uvc_parse_format(struct uvc_device *dev, 
	/* Parse the frame descriptors. Only uncompressed, MJPEG and frame

	 * based formats have frame descriptors.

	 */

	while (buflen > 2 && buffer[1] == USB_DT_CS_INTERFACE &&

	while (ftype && buflen > 2 && buffer[1] == USB_DT_CS_INTERFACE &&

	       buffer[2] == ftype) {

		frame = &format->frame[format->nframes];

		if (ftype != UVC_VS_FRAME_FRAME_BASED)