]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ALSA: usb-audio: fix sync-ep altsetting sanity check
authorJohan Hovold <johan@kernel.org>
Tue, 14 Jan 2020 08:39:53 +0000 (09:39 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 14 Jan 2020 08:42:01 +0000 (09:42 +0100)
The altsetting sanity check in set_sync_ep_implicit_fb_quirk() was
checking for there to be at least one altsetting but then went on to
access the second one, which may not exist.

This could lead to random slab data being used to initialise the sync
endpoint in snd_usb_add_endpoint().

Fixes: 3d8e7d893467 ("ALSA: snd-usb: add support for implicit feedback")
Fixes: be8f9ade8142 ("ALSA: usb-audio: FT C400 sync playback EP to capture EP")
Fixes: ade2a1abdeb6 ("ALSA: usb-audio: add implicit fb quirk for Behringer UFX1204")
Fixes: 05f7e81d04dd ("ALSA: usb-audio: add implicit fb quirk for Axe-Fx II")
Fixes: a5e68e87f543 ("ALSA: usb-audio: simplify set_sync_ep_implicit_fb_quirk")
Cc: stable <stable@vger.kernel.org> # 3.5
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20200114083953.1106-1-johan@kernel.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/pcm.c

index a11c8150af58159265ae7544bdc05c6ae758ea41..0e4eab96e23e0fcc0cdf9213617cffd6914a2423 100644 (file)
@@ -370,7 +370,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,
 add_sync_ep_from_ifnum:
        iface = usb_ifnum_to_if(dev, ifnum);
 
-       if (!iface || iface->num_altsetting == 0)
+       if (!iface || iface->num_altsetting < 2)
                return -EINVAL;
 
        alts = &iface->altsetting[1];