android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: usb: Avoid VLA in mixer_us16x08.c

Browse Source 
This is another attempt to work around the VLA used in
mixer_us16x08.c.  Basically the temporary array is used individually
for two cases, and we can declare locally in each block, instead of
hackish max() usage.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2017-05-30 23:24:45 +02:00
parent 617163fc25
commit e49a14fa36
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/usb/mixer_us16x08.c
View File

@ -698,16 +698,18 @@ static int snd_us16x08_meter_get(struct snd_kcontrol *kcontrol,
struct snd_usb_audio *chip = elem->head.mixer->chip; struct snd_usb_audio *chip = elem->head.mixer->chip;
struct snd_us16x08_meter_store *store = elem->private_data; struct snd_us16x08_meter_store *store = elem->private_data;
u8 meter_urb[64]; u8 meter_urb[64];
char tmp[max(sizeof(mix_init_msg1), sizeof(mix_init_msg2))];
switch (kcontrol->private_value) { switch (kcontrol->private_value) {
case 0: case 0: {
char tmp[sizeof(mix_init_msg1)];
memcpy(tmp, mix_init_msg1, sizeof(mix_init_msg1)); memcpy(tmp, mix_init_msg1, sizeof(mix_init_msg1));
snd_us16x08_send_urb(chip, tmp, 4); snd_us16x08_send_urb(chip, tmp, 4);
snd_us16x08_recv_urb(chip, meter_urb, snd_us16x08_recv_urb(chip, meter_urb,
sizeof(meter_urb)); sizeof(meter_urb));
kcontrol->private_value++; kcontrol->private_value++;
break; break;
}
case 1: case 1:
snd_us16x08_recv_urb(chip, meter_urb, snd_us16x08_recv_urb(chip, meter_urb,
sizeof(meter_urb)); sizeof(meter_urb));
@ -718,7 +720,9 @@ static int snd_us16x08_meter_get(struct snd_kcontrol *kcontrol,
sizeof(meter_urb)); sizeof(meter_urb));
kcontrol->private_value++; kcontrol->private_value++;
break; break;
case 3: case 3: {
char tmp[sizeof(mix_init_msg2)];
memcpy(tmp, mix_init_msg2, sizeof(mix_init_msg2)); memcpy(tmp, mix_init_msg2, sizeof(mix_init_msg2));
tmp[2] = snd_get_meter_comp_index(store); tmp[2] = snd_get_meter_comp_index(store);
snd_us16x08_send_urb(chip, tmp, 10); snd_us16x08_send_urb(chip, tmp, 10);
@ -727,6 +731,7 @@ static int snd_us16x08_meter_get(struct snd_kcontrol *kcontrol,
kcontrol->private_value = 0; kcontrol->private_value = 0;
break; break;
} }
}
for (set = 0; set < 6; set++) for (set = 0; set < 6; set++)
get_meter_levels_from_urb(set, store, meter_urb); get_meter_levels_from_urb(set, store, meter_urb);