From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
patches@lists.linux.dev, stable <stable@kernel.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Daniel Scally <dan.scally@ideasonboard.com>,
Szymon Heidrich <szymon.heidrich@gmail.com>
Subject: [PATCH 6.0 14/28] usb: gadget: uvc: Prevent buffer overflow in setup handler
Date: Mon, 19 Dec 2022 20:23:01 +0100 [thread overview]
Message-ID: <20221219182944.794460009@linuxfoundation.org> (raw)
In-Reply-To: <20221219182944.179389009@linuxfoundation.org>
From: Szymon Heidrich <szymon.heidrich@gmail.com>
commit 4c92670b16727365699fe4b19ed32013bab2c107 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: cdda479f15cd ("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>
---
drivers/usb/gadget/function/f_uvc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/drivers/usb/gadget/function/f_uvc.c
+++ b/drivers/usb/gadget/function/f_uvc.c
@@ -216,8 +216,9 @@ uvc_function_ep0_complete(struct usb_ep
memset(&v4l2_event, 0, sizeof(v4l2_event));
v4l2_event.type = UVC_EVENT_DATA;
- uvc_event->data.length = req->actual;
- memcpy(&uvc_event->data.data, req->buf, req->actual);
+ uvc_event->data.length = min_t(unsigned int, 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);
}
}
next prev parent reply other threads:[~2022-12-19 19:26 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-19 19:22 [PATCH 6.0 00/28] 6.0.15-rc1 review Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.0 01/28] PCI: mt7621: Add sentinel to quirks table Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.0 02/28] kallsyms: Make module_kallsyms_on_each_symbol generally available Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.0 03/28] ftrace: Add support to resolve module symbols in ftrace_lookup_symbols Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.0 04/28] bpf: Rename __bpf_kprobe_multi_cookie_cmp to bpf_kprobe_multi_addrs_cmp Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.0 05/28] bpf: Take module reference on kprobe_multi link Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.0 06/28] selftests/bpf: Add load_kallsyms_refresh function Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.0 07/28] selftests/bpf: Add bpf_testmod_fentry_* functions Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.0 08/28] selftests/bpf: Add kprobe_multi check to module attach test Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.0 09/28] selftests/bpf: Add kprobe_multi kmod attach api tests Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.0 10/28] udf: Discard preallocation before extending file with a hole Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.0 11/28] udf: Fix preallocation discarding at indirect extent boundary Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.0 12/28] udf: Do not bother looking for prealloc extents if i_lenExtents matches i_size Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.0 13/28] udf: Fix extending file within last block Greg Kroah-Hartman
2022-12-19 19:23 ` Greg Kroah-Hartman [this message]
2022-12-19 19:23 ` [PATCH 6.0 15/28] USB: serial: option: add Quectel EM05-G modem Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.0 16/28] USB: serial: cp210x: add Kamstrup RF sniffer PIDs Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.0 17/28] USB: serial: f81232: fix division by zero on line-speed change Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.0 18/28] USB: serial: f81534: " Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.0 19/28] ALSA: hda/realtek: fix mute/micmute LEDs for a HP ProBook Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.0 20/28] xhci: Apply XHCI_RESET_TO_DEFAULT quirk to ADL-N Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.0 21/28] igb: Initialize mailbox message for VF reset Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.0 22/28] usb: typec: ucsi: Resume in separate work Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.0 23/28] usb: dwc3: pci: Update PCIe device ID for USB3 controller on CPU sub-system for Raptor Lake Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.0 24/28] KEYS: encrypted: fix key instantiation with user-provided data Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.0 25/28] usb: ulpi: defer ulpi_register on ulpi_read_id timeout Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.0 26/28] Bluetooth: L2CAP: Fix u8 overflow Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.0 27/28] selftests: net: Use "grep -E" instead of "egrep" Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.0 28/28] net: loopback: use NET_NAME_PREDICTABLE for name_assign_type Greg Kroah-Hartman
2022-12-19 23:55 ` [PATCH 6.0 00/28] 6.0.15-rc1 review Florian Fainelli
2022-12-20 0:16 ` Shuah Khan
2022-12-20 4:44 ` Bagas Sanjaya
2022-12-20 6:41 ` Naresh Kamboju
2022-12-20 11:21 ` Sudip Mukherjee (Codethink)
2022-12-20 14:49 ` Guenter Roeck
2022-12-20 15:33 ` Guenter Roeck
2022-12-21 1:07 ` Guenter Roeck
2022-12-20 17:44 ` Ron Economos
2022-12-21 1:16 ` Slade Watkins
2022-12-21 16:04 ` Justin Forbes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221219182944.794460009@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=dan.scally@ideasonboard.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=patches@lists.linux.dev \
--cc=stable@kernel.org \
--cc=stable@vger.kernel.org \
--cc=szymon.heidrich@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).