From: Greg Kroah-Hartman Date: Sun, 10 Nov 2024 05:21:44 +0000 (+0100) Subject: 6.11-stable patches X-Git-Tag: v5.15.172~33 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19f2d2ddd0e2028bfea16ecf3d2b6de14c899637;p=thirdparty%2Fkernel%2Fstable-queue.git 6.11-stable patches added patches: media-uvcvideo-skip-parsing-frames-of-type-uvc_vs_undefined-in-uvc_parse_format.patch --- diff --git a/queue-6.11/media-uvcvideo-skip-parsing-frames-of-type-uvc_vs_undefined-in-uvc_parse_format.patch b/queue-6.11/media-uvcvideo-skip-parsing-frames-of-type-uvc_vs_undefined-in-uvc_parse_format.patch new file mode 100644 index 00000000000..559c34d2e99 --- /dev/null +++ b/queue-6.11/media-uvcvideo-skip-parsing-frames-of-type-uvc_vs_undefined-in-uvc_parse_format.patch @@ -0,0 +1,35 @@ +From ecf2b43018da9579842c774b7f35dbe11b5c38dd Mon Sep 17 00:00:00 2001 +From: Benoit Sevens +Date: Thu, 7 Nov 2024 14:22:02 +0000 +Subject: media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format + +From: Benoit Sevens + +commit ecf2b43018da9579842c774b7f35dbe11b5c38dd upstream. + +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: c0efd232929c ("V4L/DVB (8145a): USB Video Class driver") +Signed-off-by: Benoit Sevens +Cc: stable@vger.kernel.org +Acked-by: Greg Kroah-Hartman +Reviewed-by: Laurent Pinchart +Signed-off-by: Hans Verkuil +Signed-off-by: Greg Kroah-Hartman +--- + drivers/media/usb/uvc/uvc_driver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/media/usb/uvc/uvc_driver.c ++++ b/drivers/media/usb/uvc/uvc_driver.c +@@ -371,7 +371,7 @@ static int uvc_parse_format(struct uvc_d + * 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) { + unsigned int maxIntervalIndex; + diff --git a/queue-6.11/series b/queue-6.11/series index f8ec8733ffb..2c0a13a09a0 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -139,3 +139,4 @@ btrfs-reinitialize-delayed-ref-list-after-deleting-it-from-the-list.patch platform-x86-amd-pmf-relocate-cpu-id-macros-to-the-pmf-header.patch platform-x86-amd-pmf-update-smu-metrics-table-for-1ah-family-series.patch platform-x86-amd-pmf-add-smu-metrics-table-support-for-1ah-family-60h-model.patch +media-uvcvideo-skip-parsing-frames-of-type-uvc_vs_undefined-in-uvc_parse_format.patch