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

Commit ee0fe833 authored by Alyssa Milburn's avatar Alyssa Milburn Committed by Mauro Carvalho Chehab
Browse files

[media] zr364xx: enforce minimum size when reading header 



This code copies actual_length-128 bytes from the header, which will
underflow if the received buffer is too small.

Signed-off-by: default avatarAlyssa Milburn <amilburn@zall.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 821117dc

drivers/media/usb/zr364xx/zr364xx.c

+8 −0
Original line number Diff line number Diff line
@@ -600,6 +600,14 @@ static int zr364xx_read_video_callback(struct zr364xx_camera *cam, 
	ptr = pdest = frm->lpvbits;



	if (frm->ulState == ZR364XX_READ_IDLE) {

		if (purb->actual_length < 128) {

			/* header incomplete */

			dev_info(&cam->udev->dev,

				 "%s: buffer (%d bytes) too small to hold jpeg header. Discarding.\n",

				 __func__, purb->actual_length);

			return -EINVAL;

		}



		frm->ulState = ZR364XX_READ_FRAME;

		frm->cur_size = 0;