All of lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai-l3A5Bk7waGM@public.gmane.org>
To: alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org
Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Andrey Konovalov
	<andreyknvl-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
Subject: [PATCH 3/9] ALSA: caiaq: Add a sanity check for invalid EPs
Date: Tue, 10 Oct 2017 15:38:13 +0200	[thread overview]
Message-ID: <20171010133819.10567-4-tiwai@suse.de> (raw)
In-Reply-To: <20171010133819.10567-1-tiwai-l3A5Bk7waGM@public.gmane.org>

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-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Takashi Iwai <tiwai-l3A5Bk7waGM@public.gmane.org>
---
 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;
+	}
+
 	init_waitqueue_head(&cdev->ep1_wait_queue);
 	init_waitqueue_head(&cdev->prepare_wait_queue);
 
-- 
2.14.2

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2017-10-10 13:38 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-10 13:38 [PATCH 0/9] sound: Add sanity checks for invalid EPs Takashi Iwai
     [not found] ` <20171010133819.10567-1-tiwai-l3A5Bk7waGM@public.gmane.org>
2017-10-10 13:38   ` [PATCH 1/9] usb: core: Add a helper function to check the validity of EP type in URB Takashi Iwai
     [not found]     ` <20171010133819.10567-2-tiwai-l3A5Bk7waGM@public.gmane.org>
2017-10-10 13:53       ` Greg KH
2017-10-10 13:55         ` Takashi Iwai
2017-10-10 13:38   ` [PATCH 2/9] ALSA: bcd2000: Add a sanity check for invalid EPs Takashi Iwai
     [not found]     ` <20171010133819.10567-3-tiwai-l3A5Bk7waGM@public.gmane.org>
2017-10-10 14:00       ` Andrey Konovalov
2017-10-10 14:33         ` Takashi Iwai
2017-10-10 18:20           ` Andrey Konovalov
2017-10-10 13:38   ` Takashi Iwai [this message]
2017-10-10 13:38   ` [PATCH 4/9] ALSA: line6: " Takashi Iwai
2017-10-10 13:38   ` [PATCH 6/9] ALSA: usx2y: Add sanity checks " Takashi Iwai
2017-10-10 13:38   ` [PATCH 8/9] ALSA: caiaq: Add yet more " Takashi Iwai
2017-10-10 13:38   ` [PATCH 9/9] ALSA: line6: " Takashi Iwai
2017-10-10 13:38 ` [PATCH 5/9] ALSA: usb-audio: Add " Takashi Iwai
2017-10-10 13:38 ` [PATCH 7/9] ALSA: hiface: " 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=20171010133819.10567-4-tiwai@suse.de \
    --to=tiwai-l3a5bk7wagm@public.gmane.org \
    --cc=alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org \
    --cc=andreyknvl-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
    --cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.