Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 009f41ae authored by Shuah Khan's avatar Shuah Khan Committed by Greg Kroah-Hartman
Browse files

usbip: keep usbip_device sockfd state in sync with tcp_socket 



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: default avatarShuah Khan <shuahkh@osg.samsung.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b2685bda

drivers/usb/usbip/stub_dev.c

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static ssize_t usbip_sockfd_store(struct device *dev, struct device_attribute *a 
			goto err;



		sdev->ud.tcp_socket = socket;

		sdev->ud.sockfd = sockfd;



		spin_unlock_irq(&sdev->ud.lock);
@@ -172,6 +173,7 @@ static void stub_shutdown_connection(struct usbip_device *ud) 
	if (ud->tcp_socket) {

		sockfd_put(ud->tcp_socket);

		ud->tcp_socket = NULL;

		ud->sockfd = -1;

	}



	/* 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;

	spin_lock_init(&sdev->ud.lock);

	sdev->ud.tcp_socket	= NULL;

	sdev->ud.sockfd		= -1;



	INIT_LIST_HEAD(&sdev->priv_init);

	INIT_LIST_HEAD(&sdev->priv_tx);

drivers/usb/usbip/vhci_hcd.c

+2 −0
Original line number Diff line number Diff line
@@ -984,6 +984,7 @@ static void vhci_shutdown_connection(struct usbip_device *ud) 
	if (vdev->ud.tcp_socket) {

		sockfd_put(vdev->ud.tcp_socket);

		vdev->ud.tcp_socket = NULL;

		vdev->ud.sockfd = -1;

	}

	pr_info("release socket\n");
@@ -1030,6 +1031,7 @@ static void vhci_device_reset(struct usbip_device *ud) 
	if (ud->tcp_socket) {

		sockfd_put(ud->tcp_socket);

		ud->tcp_socket = NULL;

		ud->sockfd = -1;

	}

	ud->status = VDEV_ST_NULL;