From: Shuah Khan <skhan@linuxfoundation.org>
To: shuah@kernel.org, valentina.manea.m@gmail.com,
gregkh@linuxfoundation.org
Cc: Shuah Khan <skhan@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
penguin-kernel@I-love.SAKURA.ne.jp, stable@vger.kernel.org
Subject: [PATCH 3/6] usbip: fix vudc to check for stream socket
Date: Sun, 7 Mar 2021 20:53:28 -0700 [thread overview]
Message-ID: <387a670316002324113ac7ea1e8b53f4085d0c95.1615171203.git.skhan@linuxfoundation.org> (raw)
In-Reply-To: <cover.1615171203.git.skhan@linuxfoundation.org>
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>
---
drivers/usb/usbip/vudc_sysfs.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/usb/usbip/vudc_sysfs.c b/drivers/usb/usbip/vudc_sysfs.c
index 100f680c572a..83a0c59a3de8 100644
--- 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:
--
2.27.0
next prev parent reply other threads:[~2021-03-08 3:54 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-08 3:53 [PATCH 0/6] usbip fixes to crashes found by syzbot Shuah Khan
2021-03-08 3:53 ` [PATCH 1/6] usbip: fix stub_dev to check for stream socket Shuah Khan
2021-03-08 3:53 ` [PATCH 2/6] usbip: fix vhci_hcd " Shuah Khan
2021-03-08 3:53 ` Shuah Khan [this message]
2021-03-08 3:53 ` [PATCH 4/6] usbip: fix stub_dev usbip_sockfd_store() races leading to gpf Shuah Khan
2021-03-08 7:35 ` Tetsuo Handa
2021-03-08 10:10 ` Tetsuo Handa
2021-03-08 16:27 ` Shuah Khan
2021-03-09 11:04 ` Tetsuo Handa
2021-03-09 13:56 ` Tetsuo Handa
2021-03-09 19:50 ` Shuah Khan
2021-03-09 23:40 ` Tetsuo Handa
2021-03-09 23:52 ` Shuah Khan
2021-03-10 0:03 ` Tetsuo Handa
2021-03-10 0:29 ` Shuah Khan
2021-03-10 1:02 ` Tetsuo Handa
2021-03-10 2:07 ` Shuah Khan
2021-03-10 10:38 ` Tetsuo Handa
2021-03-09 15:22 ` Shuah Khan
2021-03-08 3:53 ` [PATCH 5/6] usbip: fix vhci_hcd attach_store() " Shuah Khan
2021-03-08 3:53 ` [PATCH 6/6] usbip: fix vudc usbip_sockfd_store " Shuah Khan
2021-03-10 18:33 ` [PATCH 0/6] usbip fixes to crashes found by syzbot Greg KH
2021-03-11 12:34 ` Tetsuo Handa
2021-03-11 12:57 ` Greg KH
2021-03-11 13:24 ` Tetsuo Handa
2021-03-12 5:44 ` Tetsuo Handa
2021-03-13 0:48 ` Tetsuo Handa
2021-03-14 11:38 ` Tetsuo Handa
2021-03-17 6:21 ` Tetsuo Handa
2021-03-17 15:06 ` Shuah Khan
2021-03-17 15:38 ` Tetsuo Handa
2021-03-17 17:09 ` Shuah Khan
2021-03-18 13:13 ` Shuah Khan
2021-03-18 13:39 ` Tetsuo Handa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=387a670316002324113ac7ea1e8b53f4085d0c95.1615171203.git.skhan@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
--cc=shuah@kernel.org \
--cc=stable@vger.kernel.org \
--cc=valentina.manea.m@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).