From 0141254b0a74b37aa7eb13d42a56adba84d51c73 Mon Sep 17 00:00:00 2001

From: Johan Hovold <johan@kernel.org>

Date: Fri, 20 Dec 2019 10:31:34 +0100

Subject: [PATCH] ALSA: usb-audio: fix set_format altsetting sanity check

Git-commit: 0141254b0a74b37aa7eb13d42a56adba84d51c73

Patch-mainline: v5.5-rc5

References: bsc#1051510

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: b099b9693d23 ("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>

---

 sound/usb/pcm.c |    4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/sound/usb/pcm.c

+++ b/sound/usb/pcm.c

@@ -511,9 +511,9 @@ static int set_format(struct snd_usb_sub

 	if (WARN_ON(!iface))

 		return -EINVAL;

 	alts = usb_altnum_to_altsetting(iface, fmt->altsetting);

-	altsd = get_iface_desc(alts);

-	if (WARN_ON(altsd->bAlternateSetting != fmt->altsetting))

+	if (WARN_ON(!alts))

 		return -EINVAL;

+	altsd = get_iface_desc(alts);

 	if (fmt == subs->cur_audiofmt)

 		return 0;