Skip to content

Commit

Permalink
usbip: fix stub_dev to check for stream socket
Browse files Browse the repository at this point in the history
commit 47ccc8f 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>
  • Loading branch information
shuahkh authored and gregkh committed Mar 17, 2021
1 parent c5a43bf commit 1652c10
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion drivers/usb/usbip/stub_dev.c
Expand Up @@ -69,8 +69,16 @@ static ssize_t usbip_sockfd_store(struct device *dev, struct device_attribute *a
}

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;
Expand Down Expand Up @@ -100,6 +108,8 @@ static ssize_t usbip_sockfd_store(struct device *dev, struct device_attribute *a

return count;

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

0 comments on commit 1652c10

Please sign in to comment.