mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

usbip: keep usbip_device sockfd state in sync with tcp_socket

Browse source 
Keep usbip_device sockfd state in sync with tcp_socket. When tcp_socket
is reset to null, reset sockfd to -1 to keep it in sync.

Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Shuah Khan 2018-01-26 11:56:50 -07:00 committed by Greg Kroah-Hartman
parent b2685bdacd
commit 009f41aed4
2 changed files with 5 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/usb/usbip/stub_dev.c
View file

@ -73,6 +73,7 @@ static ssize_t usbip_sockfd_store(struct device *dev, struct device_attribute *a
goto err; goto err;
sdev->ud.tcp_socket = socket; sdev->ud.tcp_socket = socket;
sdev->ud.sockfd = sockfd;
spin_unlock_irq(&sdev->ud.lock); spin_unlock_irq(&sdev->ud.lock);
@ -172,6 +173,7 @@ static void stub_shutdown_connection(struct usbip_device *ud)
if (ud->tcp_socket) { if (ud->tcp_socket) {
sockfd_put(ud->tcp_socket); sockfd_put(ud->tcp_socket);
ud->tcp_socket = NULL; ud->tcp_socket = NULL;
ud->sockfd = -1;
} }
/* 3. free used data */ /* 3. free used data */
@ -266,6 +268,7 @@ static struct stub_device *stub_device_alloc(struct usb_device *udev)
sdev->ud.status = SDEV_ST_AVAILABLE; sdev->ud.status = SDEV_ST_AVAILABLE;
spin_lock_init(&sdev->ud.lock); spin_lock_init(&sdev->ud.lock);
sdev->ud.tcp_socket = NULL; sdev->ud.tcp_socket = NULL;
sdev->ud.sockfd = -1;
INIT_LIST_HEAD(&sdev->priv_init); INIT_LIST_HEAD(&sdev->priv_init);
INIT_LIST_HEAD(&sdev->priv_tx); INIT_LIST_HEAD(&sdev->priv_tx);

2
drivers/usb/usbip/vhci_hcd.c
View file

@ -984,6 +984,7 @@ static void vhci_shutdown_connection(struct usbip_device *ud)
if (vdev->ud.tcp_socket) { if (vdev->ud.tcp_socket) {
sockfd_put(vdev->ud.tcp_socket); sockfd_put(vdev->ud.tcp_socket);
vdev->ud.tcp_socket = NULL; vdev->ud.tcp_socket = NULL;
vdev->ud.sockfd = -1;
} }
pr_info("release socket\n"); pr_info("release socket\n");
@ -1030,6 +1031,7 @@ static void vhci_device_reset(struct usbip_device *ud)
if (ud->tcp_socket) { if (ud->tcp_socket) {
sockfd_put(ud->tcp_socket); sockfd_put(ud->tcp_socket);
ud->tcp_socket = NULL; ud->tcp_socket = NULL;
ud->sockfd = -1;
} }
ud->status = VDEV_ST_NULL; ud->status = VDEV_ST_NULL;