Commit d4d82577 authored Oct 22, 2019 by Suwan Kim Committed by Greg Kroah-Hartman Oct 28, 2019

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: ea44d190 ("usbip: Implement SG support to vhci-hcd and stub driver")
Reported-by: kbuild test robot <lkp@intel.com>
Reported-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Suwan Kim <suwan.kim027@gmail.com>
Reviewed-by: Julia Lawall <julia.lawall@lip6.fr>
Acked-by: Shuah Khan <skhan@linuxfoundation.org>
Link: https://lore.kernel.org/r/20191022093017.8027-1-suwan.kim027@gmail.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 28df0642

drivers/usb/usbip/vhci_tx.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;

Admin message