[PATCH] staging: usbip: stub_dev: Fixed oops during removal of usbip_host

From: navin patidar
Date: Tue Sep 18 2012 - 00:00:56 EST


stub_device_reset should set kernel thread pointers to NULL.
so that at the time of usbip_host removal stub_shoutdown_connection
doesn't try to kill kernel threads which are already killed.

Signed-off-by: navin patidar <navinp@xxxxxxx>
---
drivers/staging/usbip/stub_dev.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/usbip/stub_dev.c b/drivers/staging/usbip/stub_dev.c
index 92ced35..447a98c 100644
--- a/drivers/staging/usbip/stub_dev.c
+++ b/drivers/staging/usbip/stub_dev.c
@@ -198,10 +198,8 @@ static void stub_shutdown_connection(struct usbip_device *ud)
* tcp_socket is freed after threads are killed so that usbip_xmit does
* not touch NULL socket.
*/
- if (ud->tcp_socket) {
+ if (ud->tcp_socket)
sock_release(ud->tcp_socket);
- ud->tcp_socket = NULL;
- }

/* 3. free used data */
stub_device_cleanup_urbs(sdev);
@@ -233,6 +231,9 @@ static void stub_device_reset(struct usbip_device *ud)

dev_dbg(&udev->dev, "device reset");

+ ud->tcp_socket = NULL;
+ ud->tcp_rx = NULL;
+ ud->tcp_tx = NULL;
ret = usb_lock_device_for_reset(udev, sdev->interface);
if (ret < 0) {
dev_err(&udev->dev, "lock for reset\n");
--
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/