Skip to content

Commit 06fd17e

Browse files
szymonhgregkh
authored andcommitted
usb: gadget: uvc: Prevent buffer overflow in setup handler
commit 4c92670 upstream. Setup function uvc_function_setup permits control transfer requests with up to 64 bytes of payload (UVC_MAX_REQUEST_SIZE), data stage handler for OUT transfer uses memcpy to copy req->actual bytes to uvc_event->data.data array of size 60. This may result in an overflow of 4 bytes. Fixes: cdda479 ("USB gadget: video class function driver") Cc: stable <[email protected]> Reviewed-by: Laurent Pinchart <[email protected]> Reviewed-by: Daniel Scally <[email protected]> Signed-off-by: Szymon Heidrich <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 7450166 commit 06fd17e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/usb/gadget/function/f_uvc.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,9 @@ uvc_function_ep0_complete(struct usb_ep *ep, struct usb_request *req)
220220

221221
memset(&v4l2_event, 0, sizeof(v4l2_event));
222222
v4l2_event.type = UVC_EVENT_DATA;
223-
uvc_event->data.length = req->actual;
224-
memcpy(&uvc_event->data.data, req->buf, req->actual);
223+
uvc_event->data.length = min_t(unsigned int, req->actual,
224+
sizeof(uvc_event->data.data));
225+
memcpy(&uvc_event->data.data, req->buf, uvc_event->data.length);
225226
v4l2_event_queue(&uvc->vdev, &v4l2_event);
226227
}
227228
}

0 commit comments

Comments
 (0)