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

Commit 86b29893 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: uvc: to the right check at uvc_ioctl_enum_framesizes() 



While the logic there is correct, it tricks both humans and
machines, a the check if "i" var is not zero is actually to
validate if the "frames" var was initialized when the loop
ran for the first time.

That produces the following warning:
	drivers/media/usb/uvc/uvc_v4l2.c:1192 uvc_ioctl_enum_framesizes() error: potentially dereferencing uninitialized 'frame'.

Change the logic to do the right test instead.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 98c1ce0c

drivers/media/usb/uvc/uvc_v4l2.c

+2 −2
Original line number Diff line number Diff line
@@ -1173,7 +1173,7 @@ static int uvc_ioctl_enum_framesizes(struct file *file, void *fh, 
	struct uvc_fh *handle = fh;

	struct uvc_streaming *stream = handle->stream;

	struct uvc_format *format = NULL;

	struct uvc_frame *frame;

	struct uvc_frame *frame = NULL;

	unsigned int index;

	unsigned int i;
@@ -1189,7 +1189,7 @@ static int uvc_ioctl_enum_framesizes(struct file *file, void *fh, 


	/* Skip duplicate frame sizes */

	for (i = 0, index = 0; i < format->nframes; i++) {

		if (i && frame->wWidth == format->frame[i].wWidth &&

		if (frame && frame->wWidth == format->frame[i].wWidth &&

		    frame->wHeight == format->frame[i].wHeight)

			continue;

		frame = &format->frame[i];