diff options
| author | Michael Grzeschik <m.grzeschik@pengutronix.de> | 2017-05-22 13:02:44 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-10-12 15:27:48 +0100 |
| commit | ff4440b1e2948503b56bb2a674e8e04dfa35f390 (patch) | |
| tree | 7f9bc98d8100fc40e605e7665cd136a9ae433c9d | |
| parent | 0c4038dace69cf54b3950b9da38632a4c06066ef (diff) | |
| download | linux-stable-ff4440b1e2948503b56bb2a674e8e04dfa35f390.tar.gz linux-stable-ff4440b1e2948503b56bb2a674e8e04dfa35f390.tar.bz2 linux-stable-ff4440b1e2948503b56bb2a674e8e04dfa35f390.zip | |
usb: usbip: set buffer pointers to NULL after free
commit b3b51417d0af63fb9a06662dc292200aed9ea53f upstream.
The usbip stack dynamically allocates the transfer_buffer and
setup_packet of each urb that got generated by the tcp to usb stub code.
As these pointers are always used only once we will set them to NULL
after use. This is done likewise to the free_urb code in vudc_dev.c.
This patch fixes double kfree situations where the usbip remote side
added the URB_FREE_BUFFER.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Acked-by: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[bwh: Backported to 3.16: adjust filenames]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/staging/usbip/stub_main.c | 4 | ||||
| -rw-r--r-- | drivers/staging/usbip/stub_tx.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/staging/usbip/stub_main.c b/drivers/staging/usbip/stub_main.c index 9c5832abbdf1..7c08d6e47221 100644 --- a/drivers/staging/usbip/stub_main.c +++ b/drivers/staging/usbip/stub_main.c @@ -266,7 +266,11 @@ void stub_device_cleanup_urbs(struct stub_device *sdev) kmem_cache_free(stub_priv_cache, priv); kfree(urb->transfer_buffer); + urb->transfer_buffer = NULL; + kfree(urb->setup_packet); + urb->setup_packet = NULL; + usb_free_urb(urb); } } diff --git a/drivers/staging/usbip/stub_tx.c b/drivers/staging/usbip/stub_tx.c index dbcabc9dbe0d..021003c4de53 100644 --- a/drivers/staging/usbip/stub_tx.c +++ b/drivers/staging/usbip/stub_tx.c @@ -28,7 +28,11 @@ static void stub_free_priv_and_urb(struct stub_priv *priv) struct urb *urb = priv->urb; kfree(urb->setup_packet); + urb->setup_packet = NULL; + kfree(urb->transfer_buffer); + urb->transfer_buffer = NULL; + list_del(&priv->list); kmem_cache_free(stub_priv_cache, priv); usb_free_urb(urb); |