Unverified Commit 088dc4aa authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14116 media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JUXQK5ENMKVMILQXEUL32FTDJNFK2UKJ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB8G1D 
 
Link:https://gitee.com/openeuler/kernel/pulls/14116

 

Reviewed-by: default avatarWang ShaoBo <bobo.shaobowang@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents e416567e 79178319

drivers/media/usb/uvc/uvc_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,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)