leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usbip: fix stub_dev to check for stream socket

Browse Source 
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>
This commit is contained in:
Shuah Khan
2021-03-07 20:53:26 -07:00
committed by Greg Kroah-Hartman
parent 1cffb1c664
commit 47ccc8fc2c
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/usbip/stub_dev.c
View File

@@ -69,8 +69,16 @@ static ssize_t usbip_sockfd_store(struct device *dev, struct device_attribute *a
} }
socket = sockfd_lookup(sockfd, &err); socket = sockfd_lookup(sockfd, &err);
if (!socket) if (!socket) {
dev_err(dev, "failed to lookup sock");
goto err; 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.tcp_socket = socket;
sdev->ud.sockfd = sockfd; sdev->ud.sockfd = sockfd;
@@ -100,6 +108,8 @@ static ssize_t usbip_sockfd_store(struct device *dev, struct device_attribute *a
return count; return count;
sock_err:
sockfd_put(socket);
err: err:
spin_unlock_irq(&sdev->ud.lock); spin_unlock_irq(&sdev->ud.lock);
return -EINVAL; return -EINVAL;