Skip to contentSkip to conversation

ALSA: usb-audio: US16x08: Move overflow check before array access

PATCH Applied Daniil Dementev 2 participants 2 messages Jun 10, 2022 – Jun 13, 2022 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: usb-audio: US16x08: Move overflow check before array access

Buffer overflow could occur in the loop "while", due to accessing an array element before checking the index.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

---
 sound/usb/mixer_us16x08.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
sound/usb/mixer_us16x08.c +3 -3
index b7b6f3834ed5..6eb7d93b358d 100644
@@ -637,10 +637,10 @@ static int snd_get_meter_comp_index(struct snd_us16x08_meter_store *store)
 		}
 	} else {
 		/* skip channels with no compressor active */
-		while (!store->comp_store->val[
+		while (store->comp_index <= SND_US16X08_MAX_CHANNELS
+			&& !store->comp_store->val[
 			COMP_STORE_IDX(SND_US16X08_ID_COMP_SWITCH)]
-			[store->comp_index - 1]
-			&& store->comp_index <= SND_US16X08_MAX_CHANNELS) {
+			[store->comp_index - 1]) {
 			store->comp_index++;
 		}
 		ret = store->comp_index++;
Signature · 1 line
2.35.1.windows.2