diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-07-10 15:33:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-22 09:22:25 +0200 |
| commit | 079bc25012d31c7eb3137d1cf3b3ce23c6050df8 (patch) | |
| tree | d7ed950a2fae30608cefdb1c6f658b0d0f3394c5 | |
| parent | 55500ddcb7f0ceec507760ab544ba92543384e33 (diff) | |
| download | linux-stable-079bc25012d31c7eb3137d1cf3b3ce23c6050df8.tar.gz linux-stable-079bc25012d31c7eb3137d1cf3b3ce23c6050df8.tar.bz2 linux-stable-079bc25012d31c7eb3137d1cf3b3ce23c6050df8.zip | |
ALSA: line6: Perform sanity check for each URB creation
commit 6e8a914ad619042c5f25a4feb663357c4170fd8d upstream.
LINE6 drivers create stream URBs with a fixed pipe without checking
its validity, and this may lead to a kernel WARNING at the submission
when a malformed USB descriptor is passed.
For avoiding the kernel warning, perform the similar sanity checks for
each pipe type at creating a URB.
Reported-by: syzbot+c190f6858a04ea7fbc52@syzkaller.appspotmail.com
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/s5hv9iv4hq8.wl-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | sound/usb/line6/capture.c | 2 | ||||
| -rw-r--r-- | sound/usb/line6/playback.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c index 7c812565f90d..a65a82d5791d 100644 --- a/sound/usb/line6/capture.c +++ b/sound/usb/line6/capture.c @@ -291,6 +291,8 @@ int line6_create_audio_in_urbs(struct snd_line6_pcm *line6pcm) urb->interval = LINE6_ISO_INTERVAL; urb->error_count = 0; urb->complete = audio_in_callback; + if (usb_urb_ep_type_check(urb)) + return -EINVAL; } return 0; diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c index 812d18191e01..1736eb3ee98e 100644 --- a/sound/usb/line6/playback.c +++ b/sound/usb/line6/playback.c @@ -436,6 +436,8 @@ int line6_create_audio_out_urbs(struct snd_line6_pcm *line6pcm) urb->interval = LINE6_ISO_INTERVAL; urb->error_count = 0; urb->complete = audio_out_callback; + if (usb_urb_ep_type_check(urb)) + return -EINVAL; } return 0; |