| Andrew Geissler | d159c7f | 2021-09-02 21:05:58 -0500 | [diff] [blame] | 1 | From 5e796671e6b8d5de4b0b423dce1b3eba144a92c9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Gerd Hoffmann <kraxel@redhat.com> |
| 3 | Date: Thu, 22 Jul 2021 09:27:56 +0200 |
| 4 | Subject: [PATCH] usbredir: fix free call |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | data might point into the middle of a larger buffer, there is a separate |
| 10 | free_on_destroy pointer passed into bufp_alloc() to handle that. It is |
| 11 | only used in the normal workflow though, not when dropping packets due |
| 12 | to the queue being full. Fix that. |
| 13 | |
| 14 | Resolves: https://gitlab.com/qemu-project/qemu/-/issues/491 |
| 15 | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> |
| 16 | Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> |
| 17 | Message-Id: <20210722072756.647673-1-kraxel@redhat.com> |
| 18 | |
| 19 | CVE: CVE-2021-3682 |
| 20 | Upstream-Status: Backport [5e796671e6b8d5de4b0b423dce1b3eba144a92c9] |
| 21 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> |
| 22 | --- |
| 23 | hw/usb/redirect.c | 2 +- |
| 24 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 25 | |
| 26 | diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c |
| 27 | index 4ec9326e05..1ec909a63a 100644 |
| 28 | --- a/hw/usb/redirect.c |
| 29 | +++ b/hw/usb/redirect.c |
| 30 | @@ -476,7 +476,7 @@ static int bufp_alloc(USBRedirDevice *dev, uint8_t *data, uint16_t len, |
| 31 | if (dev->endpoint[EP2I(ep)].bufpq_dropping_packets) { |
| 32 | if (dev->endpoint[EP2I(ep)].bufpq_size > |
| 33 | dev->endpoint[EP2I(ep)].bufpq_target_size) { |
| 34 | - free(data); |
| 35 | + free(free_on_destroy); |
| 36 | return -1; |
| 37 | } |
| 38 | dev->endpoint[EP2I(ep)].bufpq_dropping_packets = 0; |
| 39 | -- |
| 40 | 2.25.1 |
| 41 | |