Andrew Geissler | 5f35090 | 2021-07-23 13:09:54 -0400 | [diff] [blame] | 1 | From 7ec54f9eb62b5d177e30eb8b1cad795a5f8d8986 Mon Sep 17 00:00:00 2001 |
| 2 | From: Gerd Hoffmann <kraxel@redhat.com> |
| 3 | Date: Mon, 3 May 2021 15:29:12 +0200 |
| 4 | Subject: [PATCH] usb/redir: avoid dynamic stack allocation (CVE-2021-3527) |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | Use autofree heap allocation instead. |
| 10 | |
| 11 | Fixes: 4f4321c11ff ("usb: use iovecs in USBPacket") |
| 12 | Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> |
| 13 | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> |
| 14 | Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> |
| 15 | Message-Id: <20210503132915.2335822-3-kraxel@redhat.com> |
| 16 | |
| 17 | Upstream-Status: Backport |
| 18 | https://gitlab.com/qemu-project/qemu/-/commit/7ec54f9eb62b5d177e30eb8b1cad795a5f8d8986 |
| 19 | CVE: CVE-2021-3527 |
| 20 | Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> |
| 21 | |
| 22 | --- |
| 23 | hw/usb/redirect.c | 6 +++--- |
| 24 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 25 | |
| 26 | diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c |
| 27 | index 17f06f3417..6a75b0dc4a 100644 |
| 28 | --- a/hw/usb/redirect.c |
| 29 | +++ b/hw/usb/redirect.c |
| 30 | @@ -620,7 +620,7 @@ static void usbredir_handle_iso_data(USBRedirDevice *dev, USBPacket *p, |
| 31 | .endpoint = ep, |
| 32 | .length = p->iov.size |
| 33 | }; |
| 34 | - uint8_t buf[p->iov.size]; |
| 35 | + g_autofree uint8_t *buf = g_malloc(p->iov.size); |
| 36 | /* No id, we look at the ep when receiving a status back */ |
| 37 | usb_packet_copy(p, buf, p->iov.size); |
| 38 | usbredirparser_send_iso_packet(dev->parser, 0, &iso_packet, |
| 39 | @@ -818,7 +818,7 @@ static void usbredir_handle_bulk_data(USBRedirDevice *dev, USBPacket *p, |
| 40 | usbredirparser_send_bulk_packet(dev->parser, p->id, |
| 41 | &bulk_packet, NULL, 0); |
| 42 | } else { |
| 43 | - uint8_t buf[size]; |
| 44 | + g_autofree uint8_t *buf = g_malloc(size); |
| 45 | usb_packet_copy(p, buf, size); |
| 46 | usbredir_log_data(dev, "bulk data out:", buf, size); |
| 47 | usbredirparser_send_bulk_packet(dev->parser, p->id, |
| 48 | @@ -923,7 +923,7 @@ static void usbredir_handle_interrupt_out_data(USBRedirDevice *dev, |
| 49 | USBPacket *p, uint8_t ep) |
| 50 | { |
| 51 | struct usb_redir_interrupt_packet_header interrupt_packet; |
| 52 | - uint8_t buf[p->iov.size]; |
| 53 | + g_autofree uint8_t *buf = g_malloc(p->iov.size); |
| 54 | |
| 55 | DPRINTF("interrupt-out ep %02X len %zd id %"PRIu64"\n", ep, |
| 56 | p->iov.size, p->id); |
| 57 | -- |
| 58 | GitLab |
| 59 | |