Skip to content

Commit 4c92670

Browse files
szymonhgregkh
authored andcommitted
usb: gadget: uvc: Prevent buffer overflow in setup handler
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 <stable@kernel.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com> Signed-off-by: Szymon Heidrich <szymon.heidrich@gmail.com> Link: https://lore.kernel.org/r/20221206141301.51305-1-szymon.heidrich@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 97a48da commit 4c92670

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
@@ -213,8 +213,9 @@ uvc_function_ep0_complete(struct usb_ep *ep, struct usb_request *req)
213213

214214
memset(&v4l2_event, 0, sizeof(v4l2_event));
215215
v4l2_event.type = UVC_EVENT_DATA;
216-
uvc_event->data.length = req->actual;
217-
memcpy(&uvc_event->data.data, req->buf, req->actual);
216+
uvc_event->data.length = min_t(unsigned int, req->actual,
217+
sizeof(uvc_event->data.data));
218+
memcpy(&uvc_event->data.data, req->buf, uvc_event->data.length);
218219
v4l2_event_queue(&uvc->vdev, &v4l2_event);
219220
}
220221
}

0 commit comments

Comments
 (0)