Skip to content

Commit c6bf62a

Browse files
mgrzeschikgregkh
authored andcommitted
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>
1 parent ab96add commit c6bf62a

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

drivers/usb/usbip/stub_main.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,11 @@ void stub_device_cleanup_urbs(struct stub_device *sdev)
262262
kmem_cache_free(stub_priv_cache, priv);
263263

264264
kfree(urb->transfer_buffer);
265+
urb->transfer_buffer = NULL;
266+
265267
kfree(urb->setup_packet);
268+
urb->setup_packet = NULL;
269+
266270
usb_free_urb(urb);
267271
}
268272
}

drivers/usb/usbip/stub_tx.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ static void stub_free_priv_and_urb(struct stub_priv *priv)
2828
struct urb *urb = priv->urb;
2929

3030
kfree(urb->setup_packet);
31+
urb->setup_packet = NULL;
32+
3133
kfree(urb->transfer_buffer);
34+
urb->transfer_buffer = NULL;
35+
3236
list_del(&priv->list);
3337
kmem_cache_free(stub_priv_cache, priv);
3438
usb_free_urb(urb);

0 commit comments

Comments
 (0)