From 8fb2b2958b4c278595122617e219ce4a313860d2 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 16 Aug 2021 09:18:32 +0800 Subject: [PATCH] usbredir: fix free call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix 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: #491(https://gitlab.com/qemu-project/qemu/-/issues/491) Signed-off-by: Gerd Hoffmann's avatarGerd Hoffmann Reviewed-by: Marc-André Lureau's avatarMarc-André Lureau Message-Id: <20210722072756.647673-1-kraxel@redhat.com> Signed-off-by: Jiajie Li --- 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 998fc6e4b00..87338f76da6 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -459,7 +459,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; -- Gitee