提交 376a7dd6 编写于 作者: S Szymon Heidrich 提交者: sanglipeng

usb: gadget: uvc: Prevent buffer overflow in setup handler

stable inclusion
from stable-v5.10.161
commit c79538f32df12887f110dcd6b9c825b482905f24
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7P7OH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c79538f32df12887f110dcd6b9c825b482905f24

--------------------------------

commit 4c92670b 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: cdda479f ("USB gadget: video class function driver")
Cc: stable <stable@kernel.org>
Reviewed-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: NDaniel Scally <dan.scally@ideasonboard.com>
Signed-off-by: NSzymon Heidrich <szymon.heidrich@gmail.com>
Link: https://lore.kernel.org/r/20221206141301.51305-1-szymon.heidrich@gmail.comSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Nsanglipeng <sanglipeng1@jd.com>
上级 4c36465e
...@@ -213,8 +213,9 @@ uvc_function_ep0_complete(struct usb_ep *ep, struct usb_request *req) ...@@ -213,8 +213,9 @@ uvc_function_ep0_complete(struct usb_ep *ep, struct usb_request *req)
memset(&v4l2_event, 0, sizeof(v4l2_event)); memset(&v4l2_event, 0, sizeof(v4l2_event));
v4l2_event.type = UVC_EVENT_DATA; v4l2_event.type = UVC_EVENT_DATA;
uvc_event->data.length = req->actual; uvc_event->data.length = min_t(unsigned int, req->actual,
memcpy(&uvc_event->data.data, req->buf, req->actual); sizeof(uvc_event->data.data));
memcpy(&uvc_event->data.data, req->buf, uvc_event->data.length);
v4l2_event_queue(&uvc->vdev, &v4l2_event); v4l2_event_queue(&uvc->vdev, &v4l2_event);
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册