diff options
| author |   Shuah Khan <shuah@kernel.org> | 2019-01-24 14:46:42 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-12 19:15:52 +0100 |
| commit | e2aae1a99c7e24a891a579aba2cb245a291c39fc (patch) | |
| tree | 5a5e322fa45d303332f630ade2681ec95a6ffc53 /drivers | |
| parent | usbip: stub_rx: fix static checker warning on unnecessary checks (diff) | |
| download | linux-stable-e2aae1a99c7e24a891a579aba2cb245a291c39fc.tar.xz linux-stable-e2aae1a99c7e24a891a579aba2cb245a291c39fc.zip | |
usbip: Fix vhci_urb_enqueue() URB null transfer buffer error path
commit 2c904963b1dd2acd4bc785b6c72e10a6283c2081 upstream.
Fix vhci_urb_enqueue() to print debug msg and return error instead of
failing with BUG_ON.
Signed-off-by: Shuah Khan <shuah@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/usbip/vhci_hcd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c index 9936a2f199b1..ae2f56689537 100644 --- a/drivers/usb/usbip/vhci_hcd.c +++ b/drivers/usb/usbip/vhci_hcd.c @@ -512,8 +512,10 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, } vdev = &vhci->vdev[portnum-1]; - /* patch to usb_sg_init() is in 2.5.60 */ - BUG_ON(!urb->transfer_buffer && urb->transfer_buffer_length); + if (!urb->transfer_buffer && urb->transfer_buffer_length) { + dev_dbg(dev, "Null URB transfer buffer\n"); + return -EINVAL; + } spin_lock_irqsave(&vhci->lock, flags); |