Skip to content

Commit

Permalink
ALSA: echoaudio: read past end of array
Browse files Browse the repository at this point in the history
We need to cap "ucontrol->id.index / num_busses_in(chip)" so the we
don't read beyond the end of the array.

I also adding a check on "in" and changing the type in
snd_echo_mixer_put() from short to unsigned int. Those changes are done
for symmetry and are cosmetic.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Dan Carpenter authored and Takashi Iwai committed Mar 23, 2015
1 parent 034f90b commit 77008b7
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions sound/pci/echoaudio/echoaudio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1283,12 +1283,14 @@ static int snd_echo_mixer_info(struct snd_kcontrol *kcontrol,
static int snd_echo_mixer_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct echoaudio *chip;
struct echoaudio *chip = snd_kcontrol_chip(kcontrol);
unsigned int out = ucontrol->id.index / num_busses_in(chip);
unsigned int in = ucontrol->id.index % num_busses_in(chip);

chip = snd_kcontrol_chip(kcontrol);
ucontrol->value.integer.value[0] =
chip->monitor_gain[ucontrol->id.index / num_busses_in(chip)]
[ucontrol->id.index % num_busses_in(chip)];
if (out >= ECHO_MAXAUDIOOUTPUTS || in >= ECHO_MAXAUDIOINPUTS)
return -EINVAL;

ucontrol->value.integer.value[0] = chip->monitor_gain[out][in];
return 0;
}

Expand All @@ -1297,12 +1299,14 @@ static int snd_echo_mixer_put(struct snd_kcontrol *kcontrol,
{
struct echoaudio *chip;
int changed, gain;
short out, in;
unsigned int out, in;

changed = 0;
chip = snd_kcontrol_chip(kcontrol);
out = ucontrol->id.index / num_busses_in(chip);
in = ucontrol->id.index % num_busses_in(chip);
if (out >= ECHO_MAXAUDIOOUTPUTS || in >= ECHO_MAXAUDIOINPUTS)
return -EINVAL;
gain = ucontrol->value.integer.value[0];
if (gain < ECHOGAIN_MINOUT || gain > ECHOGAIN_MAXOUT)
return -EINVAL;
Expand Down

0 comments on commit 77008b7

Please sign in to comment.