1234567891011121314151617181920212223242526272829303132333435363738394041 |
- From 5e796671e6b8d5de4b0b423dce1b3eba144a92c9 Mon Sep 17 00:00:00 2001
- From: Gerd Hoffmann <kraxel@redhat.com>
- Date: Thu, 22 Jul 2021 09:27:56 +0200
- Subject: [PATCH] usbredir: fix free call
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- data might point into the middle of a larger buffer, there is a separate
- free_on_destroy pointer passed into bufp_alloc() to handle that. It is
- only used in the normal workflow though, not when dropping packets due
- to the queue being full. Fix that.
- Resolves: https://gitlab.com/qemu-project/qemu/-/issues/491
- Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
- Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
- Message-Id: <20210722072756.647673-1-kraxel@redhat.com>
- CVE: CVE-2021-3682
- Upstream-Status: Backport [5e796671e6b8d5de4b0b423dce1b3eba144a92c9]
- Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
- ---
- hw/usb/redirect.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
- index 4ec9326e05..1ec909a63a 100644
- --- a/hw/usb/redirect.c
- +++ b/hw/usb/redirect.c
- @@ -476,7 +476,7 @@ static int bufp_alloc(USBRedirDevice *dev, uint8_t *data, uint16_t len,
- if (dev->endpoint[EP2I(ep)].bufpq_dropping_packets) {
- if (dev->endpoint[EP2I(ep)].bufpq_size >
- dev->endpoint[EP2I(ep)].bufpq_target_size) {
- - free(data);
- + free(free_on_destroy);
- return -1;
- }
- dev->endpoint[EP2I(ep)].bufpq_dropping_packets = 0;
- --
- 2.25.1
|