This is a note to let you know that I've just added the patch titled usbip: fix vudc to check for stream socket to the 5.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: usbip-fix-vudc-to-check-for-stream-socket.patch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 6801854be94fe8819b3894979875ea31482f5658 Mon Sep 17 00:00:00 2001 From: Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx> Date: Sun, 7 Mar 2021 20:53:28 -0700 Subject: usbip: fix vudc to check for stream socket From: Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx> commit 6801854be94fe8819b3894979875ea31482f5658 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@xxxxxxxxxxxxxxx Suggested-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/387a670316002324113ac7ea1e8b53f4085d0c95.1615171203.git.skhan@xxxxxxxxxxxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/usb/usbip/vudc_sysfs.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- 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 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 return count; +sock_err: + sockfd_put(socket); unlock_ud: spin_unlock_irq(&udc->ud.lock); unlock: Patches currently in stable-queue which might be from skhan@xxxxxxxxxxxxxxxxxxx are queue-5.4/usbip-fix-vudc-to-check-for-stream-socket.patch queue-5.4/usbip-fix-vhci_hcd-to-check-for-stream-socket.patch queue-5.4/usbip-fix-stub_dev-to-check-for-stream-socket.patch queue-5.4/usbip-fix-vudc-usbip_sockfd_store-races-leading-to-gpf.patch queue-5.4/usbip-fix-stub_dev-usbip_sockfd_store-races-leading-to-gpf.patch queue-5.4/usbip-fix-vhci_hcd-attach_store-races-leading-to-gpf.patch