Skip to contentSkip to conversation

usbip: Fix free of unallocated memory in vhci tx

PATCH In review Suwan Kim 3 participants 3 messages Oct 22, 2019 – Oct 23, 2019

Subsystems (2)
lore
Share & tools
lore

Suwan Kim

author
#0 lore raw

PATCH v2 1/1 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")

---
v1 - v2: Move the setting NULL after kfree() and add the comment

---
 drivers/usb/usbip/vhci_tx.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/usb/usbip/vhci_tx.c +3 -0
index c3803785f6ef..0ae40a13a9fe 100644
@@ -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;
Signature · 1 line
2.20.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 11 lines · Suwan Kim

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")
Quoted 25 lines

---
v1 - v2: Move the setting NULL after kfree() and add the comment

---
 drivers/usb/usbip/vhci_tx.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/usb/usbip/vhci_tx.c +3 -1
index c3803785f6ef..0ae40a13a9fe 100644
@@ -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;
--

2.20.1

maintainer Acked-by Shuah Khan
#2 lore raw
Quoted 11 lines · Julia Lawall
Quoted 7 lines · Suwan Kim

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.

Quoted 10 lines
Quoted 4 lines
Fixes ea44d190764b ("usbip: Implement SG support to vhci-hcd and stub driver")
Quoted 3 lines

---
v1 - v2: Move the setting NULL after kfree() and add the comment
---

Thanks.

thanks,
-- Shuah