usbredir: fix free call
PATCH 1/1 usbredir: fix free call
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 <[email protected]>
--- hw/usb/redirect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/usb/redirect.c +1 -1
@@ -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 ;
Signature · 1 line
2.31.1
Hi
Quoted 8 lines · Gerd Hoffmann
data might point into the middle of a larger buffer, there is a separate
free_on_destroypointer passed intobufp_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 <[email protected]>
Reviewed-by Marc-André Lureau <[email protected]>
---
Quoted 22 lines
hw/usb/redirect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/usb/redirect.c +1
-1@@ -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.31.1
Signature · 1 line
Marc-André Lureau