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

Commit 780de727 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

media: cpia2: Fix a couple off by one bugs 




[ Upstream commit d5ac225c7d64c9c3ef821239edc035634e594ec9 ]

The cam->buffers[] array has cam->num_frames elements so the > needs to
be changed to >= to avoid going beyond the end of the array.  The
->buffers[] array is allocated in cpia2_allocate_buffers() if you want
to confirm.

Fixes: ab33d507 ("V4L/DVB (3376): Add cpia2 camera support")

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 77bbff89

drivers/media/usb/cpia2/cpia2_v4l.c

+2 −2
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ static int cpia2_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf) 
	struct camera_data *cam = video_drvdata(file);



	if(buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||

	   buf->index > cam->num_frames)

	   buf->index >= cam->num_frames)

		return -EINVAL;



	buf->m.offset = cam->buffers[buf->index].data - cam->frame_buffer;
@@ -863,7 +863,7 @@ static int cpia2_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf) 


	if(buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||

	   buf->memory != V4L2_MEMORY_MMAP ||

	   buf->index > cam->num_frames)

	   buf->index >= cam->num_frames)

		return -EINVAL;



	DBG("QBUF #%d\n", buf->index);