* usbip: Fix vhci_urb_enqueue() URB null transfer buffer error path
@ 2019-01-18 21:29 Shuah Khan
0 siblings, 0 replies; 4+ messages in thread
From: Shuah Khan @ 2019-01-18 21:29 UTC (permalink / raw)
To: valentina.manea.m, shuah, gregkh; +Cc: linux-usb, linux-kernel
From: Shuah Khan <shuah@kernel.org>
Fix vhci_urb_enqueue() to print error and return error instead of
failing with WARN_ON.
Signed-off-by: Shuah Khan <shuah@kernel.org>
---
drivers/usb/usbip/vhci_hcd.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
index 1e592ec94ba4..849ebfde87b5 100644
--- a/drivers/usb/usbip/vhci_hcd.c
+++ b/drivers/usb/usbip/vhci_hcd.c
@@ -702,8 +702,10 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
}
vdev = &vhci_hcd->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_err(dev, "Null URB transfer buffer\n");
+ return -EINVAL;
+ }
spin_lock_irqsave(&vhci->lock, flags);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* usbip: Fix vhci_urb_enqueue() URB null transfer buffer error path
@ 2019-01-19 8:21 Greg Kroah-Hartman
0 siblings, 0 replies; 4+ messages in thread
From: Greg Kroah-Hartman @ 2019-01-19 8:21 UTC (permalink / raw)
To: Shuah Khan; +Cc: valentina.manea.m, shuah, linux-usb, linux-kernel
On Fri, Jan 18, 2019 at 02:29:31PM -0700, Shuah Khan wrote:
> From: Shuah Khan <shuah@kernel.org>
>
> Fix vhci_urb_enqueue() to print error and return error instead of
> failing with WARN_ON.
>
> Signed-off-by: Shuah Khan <shuah@kernel.org>
> ---
> drivers/usb/usbip/vhci_hcd.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
> index 1e592ec94ba4..849ebfde87b5 100644
> --- a/drivers/usb/usbip/vhci_hcd.c
> +++ b/drivers/usb/usbip/vhci_hcd.c
> @@ -702,8 +702,10 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
> }
> vdev = &vhci_hcd->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_err(dev, "Null URB transfer buffer\n");
> + return -EINVAL;
> + }
Could that BUG_ON be hit by userspace somehow? Or is this just an
internal check for the api usage?
And sending out a 0 buffer length might be a valid thing (or at least a
crazy attempt at something), so you might want to make that dev_dbg() in
case userspace could trigger this to keep the log spam down.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* usbip: Fix vhci_urb_enqueue() URB null transfer buffer error path
@ 2019-01-19 16:58 Sergei Shtylyov
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2019-01-19 16:58 UTC (permalink / raw)
To: Shuah Khan, valentina.manea.m, shuah, gregkh; +Cc: linux-usb, linux-kernel
Hello!
On 01/19/2019 12:29 AM, Shuah Khan wrote:
> From: Shuah Khan <shuah@kernel.org>
>
> Fix vhci_urb_enqueue() to print error and return error instead of
> failing with WARN_ON.
It's BUG_ON().
> Signed-off-by: Shuah Khan <shuah@kernel.org>
> ---
> drivers/usb/usbip/vhci_hcd.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
> index 1e592ec94ba4..849ebfde87b5 100644
> --- a/drivers/usb/usbip/vhci_hcd.c
> +++ b/drivers/usb/usbip/vhci_hcd.c
> @@ -702,8 +702,10 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
> }
> vdev = &vhci_hcd->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_err(dev, "Null URB transfer buffer\n");
> + return -EINVAL;
> + }
>
> spin_lock_irqsave(&vhci->lock, flags);
>
MBR, Sergei
^ permalink raw reply [flat|nested] 4+ messages in thread
* usbip: Fix vhci_urb_enqueue() URB null transfer buffer error path
@ 2019-01-20 19:29 Shuah Khan
0 siblings, 0 replies; 4+ messages in thread
From: Shuah Khan @ 2019-01-20 19:29 UTC (permalink / raw)
To: Sergei Shtylyov, Shuah Khan, valentina.manea.m, gregkh
Cc: linux-usb, linux-kernel, shuah
On 1/19/19 9:58 AM, Sergei Shtylyov wrote:
> Hello!
>
> On 01/19/2019 12:29 AM, Shuah Khan wrote:
>
>> From: Shuah Khan <shuah@kernel.org>
>>
>> Fix vhci_urb_enqueue() to print error and return error instead of
>> failing with WARN_ON.
>
> It's BUG_ON().
Thanks. I will fix it.
-- Shuah
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-01-20 19:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-19 8:21 usbip: Fix vhci_urb_enqueue() URB null transfer buffer error path Greg Kroah-Hartman
-- strict thread matches above, loose matches on Subject: below --
2019-01-20 19:29 Shuah Khan
2019-01-19 16:58 Sergei Shtylyov
2019-01-18 21:29 Shuah Khan
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).