From: Johan Hovold <johan@kernel.org>
To: Takashi Iwai <tiwai@suse.de>
Cc: Andrey Konovalov <andreyknvl@google.com>,
alsa-devel@alsa-project.org, linux-usb@vger.kernel.org,
Greg KH <gregkh@linuxfoundation.org>
Subject: Re: [PATCH v2 3/9] ALSA: caiaq: Add a sanity check for invalid EPs
Date: Wed, 11 Oct 2017 16:20:31 +0200 [thread overview]
Message-ID: <20171011142031.GY4269@localhost> (raw)
In-Reply-To: <20171011103646.11879-4-tiwai@suse.de>
On Wed, Oct 11, 2017 at 12:36:40PM +0200, Takashi Iwai wrote:
> As syzkaller spotted, currently caiaq driver submits a URB with the
> fixed EP without checking whether it's actually available, which may
> result in a kernel warning like:
> usb 1-1: BOGUS urb xfer, pipe 3 != type 1
> ------------[ cut here ]------------
> WARNING: CPU: 1 PID: 1150 at drivers/usb/core/urb.c:449
> usb_submit_urb+0xf8a/0x11d0
> Modules linked in:
> CPU: 1 PID: 1150 Comm: kworker/1:1 Not tainted
> 4.14.0-rc2-42660-g24b7bd59eec0 #277
> Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011
> Workqueue: usb_hub_wq hub_event
> Call Trace:
> init_card sound/usb/caiaq/device.c:467
> snd_probe+0x81c/0x1150 sound/usb/caiaq/device.c:525
> usb_probe_interface+0x35d/0x8e0 drivers/usb/core/driver.c:361
> ....
>
> This patch adds a sanity check of validity of EPs at the device
> initialization phase for avoiding the call with an invalid EP.
>
> Reported-by: Andrey Konovalov <andreyknvl@google.com>
> Tested-by: Andrey Konovalov <andreyknvl@google.com>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
> sound/usb/caiaq/device.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c
> index 0fb6b1b79261..a29674bf96e5 100644
> --- a/sound/usb/caiaq/device.c
> +++ b/sound/usb/caiaq/device.c
> @@ -461,6 +461,13 @@ static int init_card(struct snd_usb_caiaqdev *cdev)
> cdev->midi_out_buf, EP1_BUFSIZE,
> snd_usb_caiaq_midi_output_done, cdev);
>
> + /* sanity checks of EPs before actually submitting */
> + if (usb_urb_ep_type_check(&cdev->ep1_in_urb) ||
> + usb_urb_ep_type_check(&cdev->midi_out_urb)) {
> + dev_err(dev, "invalid EPs\n");
> + return -EINVAL;
> + }
> +
Unrelated to this patch, but this driver fails to kill the ep1_in_urb
(which is submitted in this function) in case of later probe errors.
This can lead to use-after-free or crashes in the completion callback.
> init_waitqueue_head(&cdev->ep1_wait_queue);
> init_waitqueue_head(&cdev->prepare_wait_queue);
Johan
next prev parent reply other threads:[~2017-10-11 14:20 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-11 10:36 [PATCH v2 0/9] sound: Add sanity checks for invalid EPs Takashi Iwai
[not found] ` <20171011103646.11879-1-tiwai-l3A5Bk7waGM@public.gmane.org>
2017-10-11 10:36 ` [PATCH v2 1/9] usb: core: Add a helper function to check the validity of EP type in URB Takashi Iwai
2017-10-11 14:14 ` Johan Hovold
2017-10-11 14:31 ` Takashi Iwai
[not found] ` <s5hbmld92ok.wl-tiwai-l3A5Bk7waGM@public.gmane.org>
2017-10-11 14:58 ` Johan Hovold
2017-10-11 10:36 ` [PATCH v2 2/9] ALSA: bcd2000: Add a sanity check for invalid EPs Takashi Iwai
2017-10-11 10:36 ` [PATCH v2 3/9] ALSA: caiaq: " Takashi Iwai
2017-10-11 14:20 ` Johan Hovold [this message]
2017-10-11 14:40 ` Takashi Iwai
[not found] ` <s5ha80x928r.wl-tiwai-l3A5Bk7waGM@public.gmane.org>
2017-10-11 14:49 ` Johan Hovold
2017-10-11 15:05 ` Takashi Iwai
2017-10-11 10:36 ` [PATCH v2 4/9] ALSA: line6: " Takashi Iwai
2017-10-11 14:28 ` Johan Hovold
2017-10-11 14:45 ` Takashi Iwai
[not found] ` <s5h7ew1920z.wl-tiwai-l3A5Bk7waGM@public.gmane.org>
2017-10-11 14:52 ` Johan Hovold
2017-10-11 14:58 ` Takashi Iwai
2017-10-11 10:36 ` [PATCH v2 5/9] ALSA: usb-audio: Add sanity checks " Takashi Iwai
2017-10-11 10:36 ` [PATCH v2 7/9] ALSA: hiface: " Takashi Iwai
2017-10-11 10:36 ` [PATCH v2 8/9] ALSA: caiaq: Add yet more " Takashi Iwai
2017-10-11 10:36 ` [PATCH v2 9/9] ALSA: line6: " Takashi Iwai
[not found] ` <20171011103646.11879-10-tiwai-l3A5Bk7waGM@public.gmane.org>
2017-10-11 14:39 ` Johan Hovold
2017-10-11 14:48 ` Takashi Iwai
2017-10-11 10:36 ` [PATCH v2 6/9] ALSA: usx2y: Add " Takashi Iwai
[not found] ` <20171011103646.11879-7-tiwai-l3A5Bk7waGM@public.gmane.org>
2017-10-11 14:33 ` Johan Hovold
2017-10-11 14:43 ` Takashi Iwai
2017-10-11 13:03 ` [PATCH v2 0/9] sound: " Greg KH
[not found] ` <20171011130329.GI27734-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2017-10-11 13:15 ` Takashi Iwai
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=20171011142031.GY4269@localhost \
--to=johan@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=andreyknvl@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=tiwai@suse.de \
/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;
as well as URLs for NNTP newsgroup(s).