diff options
| author | Suwan Kim <suwan.kim027@gmail.com> | 2019-10-22 18:30:17 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-12 19:21:20 +0100 |
| commit | 5833560d54fdf7a33bdde78bf45bfdc67a297e86 (patch) | |
| tree | 15a6afd030f52937e15a6a301c381e5030676261 | |
| parent | 6890b4bc3d2bd1716f63d1c1db91a397876cd82a (diff) | |
| download | linux-stable-5833560d54fdf7a33bdde78bf45bfdc67a297e86.tar.gz linux-stable-5833560d54fdf7a33bdde78bf45bfdc67a297e86.tar.bz2 linux-stable-5833560d54fdf7a33bdde78bf45bfdc67a297e86.zip | |
usbip: Fix free of unallocated memory in vhci tx
[ Upstream commit d4d8257754c3300ea2a465dadf8d2b02c713c920 ]
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 <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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/usb/usbip/vhci_tx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/usbip/vhci_tx.c b/drivers/usb/usbip/vhci_tx.c index 61b1fd379ad2..acac49402c2b 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; |