Commit 6162d497 authored Mar 07, 2021 by Shuah Khan Committed by Greg Kroah-Hartman Mar 17, 2021

usbip: fix stub_dev to check for stream socket

commit 47ccc8fc2c9c94558b27b6f9e2582df32d29e6e8 upstream.

Fix usbip_sockfd_store() to validate the passed in file descriptor is
a stream socket. If the file descriptor passed was a SOCK_DGRAM socket,
sock_recvmsg() can't detect end of stream.

Cc: stable@vger.kernel.org
Suggested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Link: https://lore.kernel.org/r/e942d2bd03afb8e8552bd2a5d84e18d17670d521.1615171203.git.skhan@linuxfoundation.org

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent f8a9a2e1

drivers/usb/usbip/stub_dev.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -83,8 +83,16 @@ static ssize_t store_sockfd(struct device dev, struct device_attribute attr,
		}

		socket = sockfd_lookup(sockfd, &err);
		if (!socket)
		if (!socket) {
		dev_err(dev, "failed to lookup sock");
		goto err;
		}

		if (socket->type != SOCK_STREAM) {
		dev_err(dev, "Expecting SOCK_STREAM - found %d",
		socket->type);
		goto sock_err;
		}

		sdev->ud.tcp_socket = socket;
		sdev->ud.sockfd = sockfd;
		@@ -114,6 +122,8 @@ static ssize_t store_sockfd(struct device dev, struct device_attribute attr,

		return count;

		sock_err:
		sockfd_put(socket);
		err:
		spin_unlock_irq(&sdev->ud.lock);
		return -EINVAL;