1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859 |
- From 7ec54f9eb62b5d177e30eb8b1cad795a5f8d8986 Mon Sep 17 00:00:00 2001
- From: Gerd Hoffmann <kraxel@redhat.com>
- Date: Mon, 3 May 2021 15:29:12 +0200
- Subject: [PATCH] usb/redir: avoid dynamic stack allocation (CVE-2021-3527)
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- Use autofree heap allocation instead.
- Fixes: 4f4321c11ff ("usb: use iovecs in USBPacket")
- Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
- Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
- Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
- Message-Id: <20210503132915.2335822-3-kraxel@redhat.com>
- Upstream-Status: Backport
- https://gitlab.com/qemu-project/qemu/-/commit/7ec54f9eb62b5d177e30eb8b1cad795a5f8d8986
- CVE: CVE-2021-3527
- Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
- ---
- hw/usb/redirect.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
- diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
- index 17f06f3417..6a75b0dc4a 100644
- --- a/hw/usb/redirect.c
- +++ b/hw/usb/redirect.c
- @@ -620,7 +620,7 @@ static void usbredir_handle_iso_data(USBRedirDevice *dev, USBPacket *p,
- .endpoint = ep,
- .length = p->iov.size
- };
- - uint8_t buf[p->iov.size];
- + g_autofree uint8_t *buf = g_malloc(p->iov.size);
- /* No id, we look at the ep when receiving a status back */
- usb_packet_copy(p, buf, p->iov.size);
- usbredirparser_send_iso_packet(dev->parser, 0, &iso_packet,
- @@ -818,7 +818,7 @@ static void usbredir_handle_bulk_data(USBRedirDevice *dev, USBPacket *p,
- usbredirparser_send_bulk_packet(dev->parser, p->id,
- &bulk_packet, NULL, 0);
- } else {
- - uint8_t buf[size];
- + g_autofree uint8_t *buf = g_malloc(size);
- usb_packet_copy(p, buf, size);
- usbredir_log_data(dev, "bulk data out:", buf, size);
- usbredirparser_send_bulk_packet(dev->parser, p->id,
- @@ -923,7 +923,7 @@ static void usbredir_handle_interrupt_out_data(USBRedirDevice *dev,
- USBPacket *p, uint8_t ep)
- {
- struct usb_redir_interrupt_packet_header interrupt_packet;
- - uint8_t buf[p->iov.size];
- + g_autofree uint8_t *buf = g_malloc(p->iov.size);
-
- DPRINTF("interrupt-out ep %02X len %zd id %"PRIu64"\n", ep,
- p->iov.size, p->id);
- --
- GitLab
|