summaryrefslogtreecommitdiff
path: root/sound/usb
diff options
context:
space:
mode:
authorJohan Carlsson <johan.carlsson@teenage.engineering>2024-03-13 09:15:09 +0100
committerTakashi Iwai <tiwai@suse.de>2024-03-13 14:29:22 +0100
commita39d51ff1f52cd0b6fe7d379ac93bd8b4237d1b7 (patch)
tree0102e7cdb2728afaf5c69a2bd2c3c92ad7e8a0ea /sound/usb
parent526d028341f73c0f2dbd5e4855a59ebb6d620be5 (diff)
ALSA: usb-audio: Stop parsing channels bits when all channels are found.
If a usb audio device sets more bits than the amount of channels it could write outside of the map array. Signed-off-by: Johan Carlsson <johan.carlsson@teenage.engineering> Fixes: 04324ccc75f9 ("ALSA: usb-audio: add channel map support") Message-ID: <20240313081509.9801-1-johan.carlsson@teenage.engineering> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/stream.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/usb/stream.c b/sound/usb/stream.c
index 3d4add94e367..d5409f387945 100644
--- a/sound/usb/stream.c
+++ b/sound/usb/stream.c
@@ -300,9 +300,12 @@ static struct snd_pcm_chmap_elem *convert_chmap(int channels, unsigned int bits,
c = 0;
if (bits) {
- for (; bits && *maps; maps++, bits >>= 1)
+ for (; bits && *maps; maps++, bits >>= 1) {
if (bits & 1)
chmap->map[c++] = *maps;
+ if (c == chmap->channels)
+ break;
+ }
} else {
/* If we're missing wChannelConfig, then guess something
to make sure the channel map is not skipped entirely */