diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2011-06-24 15:48:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-04 21:58:31 -0700 |
| commit | efa73f1334e339902993bb4894da47242f0c4173 (patch) | |
| tree | 5a819ac0a5cf3a48854396cdc26490be8f10c202 /drivers/staging | |
| parent | 97edbc901240090ca75b81aa8955bcef8d570434 (diff) | |
| download | kernel_samsung_aries-efa73f1334e339902993bb4894da47242f0c4173.zip kernel_samsung_aries-efa73f1334e339902993bb4894da47242f0c4173.tar.gz kernel_samsung_aries-efa73f1334e339902993bb4894da47242f0c4173.tar.bz2 | |
Staging: usbip: vhci-hcd: Do not kill already dead RX/TX kthread
commit 8547d4cc2b616e4f1dafebe2c673fc986422b506 upstream.
When unbinding a device on the host which was still attached on the
client, I got a NULL pointer dereference on the client. This turned out
to be due to kthread_stop() being called on an already dead kthread.
Here is how I was able to reproduce the problem:
server:# usbip bind -b 1-2
client:# usbip attach -h server -b 1-2
server:# usbip unbind -b 1-2
This patch fixes the problem by checking the kthread before attempting
to kill it, as it is done on the opposite side in
stub_shutdown_connection().
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/usbip/vhci_hcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c index a76e8fa..76d7485 100644 --- a/drivers/staging/usbip/vhci_hcd.c +++ b/drivers/staging/usbip/vhci_hcd.c @@ -846,9 +846,9 @@ static void vhci_shutdown_connection(struct usbip_device *ud) } /* kill threads related to this sdev, if v.c. exists */ - if (vdev->ud.tcp_rx) + if (vdev->ud.tcp_rx && !task_is_dead(vdev->ud.tcp_rx)) kthread_stop(vdev->ud.tcp_rx); - if (vdev->ud.tcp_tx) + if (vdev->ud.tcp_tx && !task_is_dead(vdev->ud.tcp_tx)) kthread_stop(vdev->ud.tcp_tx); pr_info("stop threads\n"); |