Commit f0577b1b authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Mauro Carvalho Chehab
Browse files

media: uvcvideo: Avoid invalid memory access 



If mappings points to an invalid memory, we will be invalid accessing
it. Solve it by initializing the value of the variable mapping and by
changing the order in the conditional statement (to avoid accessing
mapping->id if not needed).

Fix:
kasan: GPF could be caused by NULL-ptr deref or user memory access
general protection fault: 0000 [#1] PREEMPT SMP KASAN NOPTI

Fixes: 6350d6a4 ("media: uvcvideo: Set error_idx during ctrl_commit errors")
Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent c8ed7d2f

drivers/media/usb/uvc/uvc_ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -1638,7 +1638,7 @@ static int uvc_ctrl_find_ctrl_idx(struct uvc_entity *entity, 
				  struct v4l2_ext_controls *ctrls,

				  struct uvc_control *uvc_control)

{

	struct uvc_control_mapping *mapping;

	struct uvc_control_mapping *mapping = NULL;

	struct uvc_control *ctrl_found;

	unsigned int i;