38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
Date: Thu, 22 Jul 2021 09:27:56 +0200
|
||
|
|
Subject: usbredir: fix free call
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Git-commit: 5e796671e6b8d5de4b0b423dce1b3eba144a92c9
|
||
|
|
References: bsc#1189145 CVE-2021-3682
|
||
|
|
|
||
|
|
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>
|
||
|
|
Signed-off-by: Jose R. Ziviani <jziviani@suse.de>
|
||
|
|
---
|
||
|
|
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 17f06f34179a257e3fd2b354164e..af1721a391139818ec9007c16f55 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;
|