From: Florian Fainelli <f.fainelli@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: "Florian Fainelli" <f.fainelli@gmail.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Felipe Balbi" <balbi@kernel.org>,
"Peter Chen" <peter.chen@nxp.com>,
"Roger Quadros" <rogerq@ti.com>,
"Alan Stern" <stern@rowland.harvard.edu>,
"Mathias Nyman" <mathias.nyman@linux.intel.com>,
"Javier Martinez Canillas" <javier@osg.samsung.com>,
"Baoyou Xie" <baoyou.xie@linaro.org>,
"Sekhar Nori" <nsekhar@ti.com>,
"William wu" <wulf@rock-chips.com>,
"Arnd Bergmann" <arnd@arndb.de>,
"Chris Bainbridge" <chris.bainbridge@gmail.com>,
"Wolfram Sang" <wsa-dev@sang-engineering.com>,
"Krzysztof Opasiak" <k.opasiak@samsung.com>,
"Felix Hädicke" <felixhaedicke@web.de>,
"Colin Ian King" <colin.king@canonical.com>,
linux-usb@vger.kernel.org (open list:USB SUBSYSTEM),
clemens@ladisch.de, maksim.salau@gmail.com
Subject: [PATCH v3 1/2] usb: core: Check URB setup_packet and transfer_buffer sanity
Date: Tue, 25 Apr 2017 17:56:11 -0700 [thread overview]
Message-ID: <20170426005612.24850-2-f.fainelli@gmail.com> (raw)
In-Reply-To: <20170426005612.24850-1-f.fainelli@gmail.com>
Update usb_hcd_map_urb_for_dma() to check for an URB's setup_packet and
transfer_buffer sanity. We first check that urb->setup_packet is neither
coming from vmalloc space nor is an on stack buffer, and if that's the
case, produce a warning and return an error. For urb->transfer_buffer
there is an existing is_vmalloc_addr() check so we just supplement that
with an object_is_on_stack() check, produce a warning if that is the case
and also return an error.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/usb/core/hcd.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 49550790a3cb..26d710eec7da 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -26,6 +26,7 @@
#include <linux/module.h>
#include <linux/version.h>
#include <linux/kernel.h>
+#include <linux/sched/task_stack.h>
#include <linux/slab.h>
#include <linux/completion.h>
#include <linux/utsname.h>
@@ -1523,6 +1524,14 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,
if (hcd->self.uses_pio_for_control)
return ret;
if (IS_ENABLED(CONFIG_HAS_DMA) && hcd->self.uses_dma) {
+ if (is_vmalloc_addr(urb->setup_packet)) {
+ WARN_ONCE(1, "setup packet is not dma capable\n");
+ return -EAGAIN;
+ } else if (object_is_on_stack(urb->setup_packet)) {
+ WARN_ONCE(1, "setup packet is on stack\n");
+ return -EAGAIN;
+ }
+
urb->setup_dma = dma_map_single(
hcd->self.sysdev,
urb->setup_packet,
@@ -1587,6 +1596,9 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,
} else if (is_vmalloc_addr(urb->transfer_buffer)) {
WARN_ONCE(1, "transfer buffer not dma capable\n");
ret = -EAGAIN;
+ } else if (object_is_on_stack(urb->transfer_buffer)) {
+ WARN_ONCE(1, "transfer buffer is on stack\n");
+ ret = -EAGAIN;
} else {
urb->transfer_dma = dma_map_single(
hcd->self.sysdev,
--
2.9.3
next prev parent reply other threads:[~2017-04-26 0:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-26 0:56 [PATCH v3 0/2] usb: Check for DMA capable buffer sanity Florian Fainelli
2017-04-26 0:56 ` Florian Fainelli [this message]
2017-04-26 0:56 ` [PATCH v3 2/2] usb: udc: core: Error if req->buf is either from vmalloc or stack Florian Fainelli
2017-05-05 21:08 ` [PATCH v3 0/2] usb: Check for DMA capable buffer sanity Florian Fainelli
2017-05-28 16:03 ` Wolfram Sang
2017-05-31 11:04 ` David Laight
2017-05-31 11:55 ` Vignesh R
2017-05-31 15:50 ` Wolfram Sang
2017-05-31 19:23 ` Wolfram Sang
2017-05-31 11:56 ` Vignesh R
2017-05-31 15:12 ` Wolfram Sang
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=20170426005612.24850-2-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=arnd@arndb.de \
--cc=balbi@kernel.org \
--cc=baoyou.xie@linaro.org \
--cc=chris.bainbridge@gmail.com \
--cc=clemens@ladisch.de \
--cc=colin.king@canonical.com \
--cc=felixhaedicke@web.de \
--cc=gregkh@linuxfoundation.org \
--cc=javier@osg.samsung.com \
--cc=k.opasiak@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=maksim.salau@gmail.com \
--cc=mathias.nyman@linux.intel.com \
--cc=nsekhar@ti.com \
--cc=peter.chen@nxp.com \
--cc=rogerq@ti.com \
--cc=stern@rowland.harvard.edu \
--cc=wsa-dev@sang-engineering.com \
--cc=wulf@rock-chips.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
Powered by JetHome