From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 22 Jul 2021 07:27:56 +0000 (+0200)
Subject: usbredir: fix free call
X-Git-Tag: upstream/4.2.1~33
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=304d6e8b9a1da7d392904a34565e90113f42c568;p=tools%2Fqemu-arm-static.git

usbredir: fix free call

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 <jose.ziviani@suse.com>
---

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index dd779c45d..7efff2b28 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -463,7 +463,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;