aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSuwan Kim <[email protected]>2019-10-22 18:30:17 +0900
committerGreg Kroah-Hartman <[email protected]>2019-10-28 17:51:06 +0100
commitd4d8257754c3300ea2a465dadf8d2b02c713c920 (patch)
treefef21ca998d53333180ec2e9ad1032c87f7fe3e1
parent28df0642abbf6d66908a2858922a7e4b21cdd8c2 (diff)
usbip: Fix free of unallocated memory in vhci tx
iso_buffer should be set to NULL after use and free in the while loop. In the case of isochronous URB in the while loop, iso_buffer is allocated and after sending it to server, buffer is deallocated. And then, if the next URB in the while loop is not a isochronous pipe, iso_buffer still holds the previously deallocated buffer address and kfree tries to free wrong buffer address. Fixes: ea44d190764b ("usbip: Implement SG support to vhci-hcd and stub driver") Reported-by: kbuild test robot <[email protected]> Reported-by: Julia Lawall <[email protected]> Signed-off-by: Suwan Kim <[email protected]> Reviewed-by: Julia Lawall <[email protected]> Acked-by: Shuah Khan <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/usb/usbip/vhci_tx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/usbip/vhci_tx.c b/drivers/usb/usbip/vhci_tx.c
index c3803785f6ef..0ae40a13a9fe 100644
--- a/drivers/usb/usbip/vhci_tx.c
+++ b/drivers/usb/usbip/vhci_tx.c
@@ -147,7 +147,10 @@ static int vhci_send_cmd_submit(struct vhci_device *vdev)
}
kfree(iov);
+ /* This is only for isochronous case */
kfree(iso_buffer);
+ iso_buffer = NULL;
+
usbip_dbg_vhci_tx("send txdata\n");
total_size += txsize;