projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f55a057
)
usbip: fix vudc to check for stream socket
author
Shuah Khan
<skhan@linuxfoundation.org>
Mon, 8 Mar 2021 03:53:28 +0000
(20:53 -0700)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 10 Mar 2021 18:32:34 +0000
(19:32 +0100)
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/387a670316002324113ac7ea1e8b53f4085d0c95.1615171203.git.skhan@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/usbip/vudc_sysfs.c
patch
|
blob
|
history
diff --git
a/drivers/usb/usbip/vudc_sysfs.c
b/drivers/usb/usbip/vudc_sysfs.c
index 100f680c572ae149017d6ff26cd5950533dae8be..83a0c59a3de8a5a9e2f03e76cd612916910f7b55 100644
(file)
--- a/
drivers/usb/usbip/vudc_sysfs.c
+++ b/
drivers/usb/usbip/vudc_sysfs.c
@@
-138,6
+138,13
@@
static ssize_t usbip_sockfd_store(struct device *dev, struct device_attribute *a
goto unlock_ud;
}
+ if (socket->type != SOCK_STREAM) {
+ dev_err(dev, "Expecting SOCK_STREAM - found %d",
+ socket->type);
+ ret = -EINVAL;
+ goto sock_err;
+ }
+
udc->ud.tcp_socket = socket;
spin_unlock_irq(&udc->ud.lock);
@@
-177,6
+184,8
@@
static ssize_t usbip_sockfd_store(struct device *dev, struct device_attribute *a
return count;
+sock_err:
+ sockfd_put(socket);
unlock_ud:
spin_unlock_irq(&udc->ud.lock);
unlock: