From: Greg KH <gregkh@linuxfoundation.org>
To: Shuah Khan <skhan@linuxfoundation.org>
Cc: valentina.manea.m@gmail.com, shuah@kernel.org,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] usbip: Fix vhci_urb_enqueue() URB null transfer buffer error path
Date: Sat, 19 Jan 2019 09:21:39 +0100 [thread overview]
Message-ID: <20190119082139.GB8204@kroah.com> (raw)
In-Reply-To: <20190118212931.18482-2-skhan@linuxfoundation.org>
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
next prev parent reply other threads:[~2019-01-19 8:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-18 21:29 [PATCH] usbip: Fix vep_free_request() null pointer checks on input args Shuah Khan
2019-01-18 21:29 ` [PATCH] usbip: Fix vhci_urb_enqueue() URB null transfer buffer error path Shuah Khan
2019-01-19 8:21 ` Greg KH [this message]
2019-01-19 16:58 ` Sergei Shtylyov
2019-01-20 19:29 ` shuah
2019-01-19 8:17 ` [PATCH] usbip: Fix vep_free_request() null pointer checks on input args Greg KH
2019-01-22 23:05 ` shuah
2019-01-25 8:02 ` Greg KH
2019-01-25 14:26 ` shuah
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=20190119082139.GB8204@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.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
Powered by JetHome