diff options
| author | Shuah Khan <skhan@linuxfoundation.org> | 2021-03-07 20:53:27 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-17 16:43:49 +0100 |
| commit | 29e44faa84682fdfe34815852dd3480d86f509df (patch) | |
| tree | 66706f0213b41c32563b0887199429118fea5222 | |
| parent | 156be7533d585c30c6fcc1703d27a261f7788e0b (diff) | |
| download | linux-stable-29e44faa84682fdfe34815852dd3480d86f509df.tar.gz linux-stable-29e44faa84682fdfe34815852dd3480d86f509df.tar.bz2 linux-stable-29e44faa84682fdfe34815852dd3480d86f509df.zip | |
usbip: fix vhci_hcd to check for stream socket
commit f55a0571690c4aae03180e001522538c0927432f upstream.
Fix attach_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/52712aa308915bda02cece1589e04ee8b401d1f3.1615171203.git.skhan@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/usbip/vhci_sysfs.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/usb/usbip/vhci_sysfs.c b/drivers/usb/usbip/vhci_sysfs.c index be37aec250c2..18a0fa649cd4 100644 --- a/drivers/usb/usbip/vhci_sysfs.c +++ b/drivers/usb/usbip/vhci_sysfs.c @@ -349,8 +349,16 @@ static ssize_t attach_store(struct device *dev, struct device_attribute *attr, /* Extract socket from fd. */ socket = sockfd_lookup(sockfd, &err); - if (!socket) + if (!socket) { + dev_err(dev, "failed to lookup sock"); return -EINVAL; + } + if (socket->type != SOCK_STREAM) { + dev_err(dev, "Expecting SOCK_STREAM - found %d", + socket->type); + sockfd_put(socket); + return -EINVAL; + } /* now need lock until setting vdev status as used */ |