diff options
| author | Kees Cook <keescook@chromium.org> | 2019-10-29 22:34:23 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-10-31 14:40:43 +0100 |
| commit | b3d53f5fce5d07b4981f0f4f93e579e389a99b07 (patch) | |
| tree | 6fdc22a44156329bd4b7c8a88c1802c19f4a9abe | |
| parent | kernel: dma-contiguous: mark CMA parameters __initdata/__initconst (diff) | |
| download | linux-b3d53f5fce5d07b4981f0f4f93e579e389a99b07.tar.xz linux-b3d53f5fce5d07b4981f0f4f93e579e389a99b07.zip | |
usb: core: Remove redundant vmap checks
Now that the vmap area checks are being performed in the DMA
infrastructure directly, there is no need to repeat them in USB.
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | drivers/usb/core/hcd.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index f225eaa98ff8..281568d464f9 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -1410,10 +1410,7 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, if (hcd->self.uses_pio_for_control) return ret; if (hcd_uses_dma(hcd)) { - 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)) { + if (object_is_on_stack(urb->setup_packet)) { WARN_ONCE(1, "setup packet is on stack\n"); return -EAGAIN; } @@ -1479,9 +1476,6 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, ret = -EAGAIN; else urb->transfer_flags |= URB_DMA_MAP_PAGE; - } 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; |