ALSA: usb-audio: fix set_format altsetting sanity check
commit5.4-rM2-2.2.x-imx-squashed0141254b0a
upstream. Make sure to check the return value of usb_altnum_to_altsetting() to avoid dereferencing a NULL pointer when the requested alternate settings is missing. The format altsetting number may come from a quirk table and there does not seem to be any other validation of it (the corresponding index is checked however). Fixes:b099b9693d
("ALSA: usb-audio: Avoid superfluous usb_set_interface() calls") Cc: stable <stable@vger.kernel.org> # 4.18 Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://lore.kernel.org/r/20191220093134.1248-1-johan@kernel.org Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
60a6c5d810
commit
f47e521243
|
@ -506,9 +506,9 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
|
||||||
if (WARN_ON(!iface))
|
if (WARN_ON(!iface))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
alts = usb_altnum_to_altsetting(iface, fmt->altsetting);
|
alts = usb_altnum_to_altsetting(iface, fmt->altsetting);
|
||||||
altsd = get_iface_desc(alts);
|
if (WARN_ON(!alts))
|
||||||
if (WARN_ON(altsd->bAlternateSetting != fmt->altsetting))
|
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
altsd = get_iface_desc(alts);
|
||||||
|
|
||||||
if (fmt == subs->cur_audiofmt)
|
if (fmt == subs->cur_audiofmt)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue