diff for duplicates of <20150323094131.GE558@mwanda> diff --git a/a/1.txt b/N1/1.txt index 571ffc7..3a32dc2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,8 +21,7 @@ index a962de0..862db9a 100644 + 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->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; diff --git a/a/content_digest b/N1/content_digest index 2c814c8..e136751 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] ALSA: echoaudio: read past end of array\0" - "Date\0Mon, 23 Mar 2015 12:41:31 +0300\0" + "Date\0Mon, 23 Mar 2015 09:41:31 +0000\0" "To\0Jaroslav Kysela <perex@perex.cz>\0" "Cc\0Takashi Iwai <tiwai@suse.de>" alsa-devel@alsa-project.org @@ -32,8 +32,7 @@ "+\tunsigned int in = ucontrol->id.index % num_busses_in(chip);\n" " \n" "-\tchip = snd_kcontrol_chip(kcontrol);\n" - "-\tucontrol->value.integer.value[0] =\n" - "-\t\tchip->monitor_gain[ucontrol->id.index / num_busses_in(chip)]\n" + "-\tucontrol->value.integer.value[0] -\t\tchip->monitor_gain[ucontrol->id.index / num_busses_in(chip)]\n" "-\t\t\t[ucontrol->id.index % num_busses_in(chip)];\n" "+\tif (out >= ECHO_MAXAUDIOOUTPUTS || in >= ECHO_MAXAUDIOINPUTS)\n" "+\t\treturn -EINVAL;\n" @@ -59,4 +58,4 @@ " \tif (gain < ECHOGAIN_MINOUT || gain > ECHOGAIN_MAXOUT)\n" " \t\treturn -EINVAL;" -ea243e74e73b2d09e42fe0ac1ae71ecbd6a30f94d9d87c0fdeb359eeecdc5640 +ef0501ec5f90d771d9dc4e0bc6c3a820d9a02188f7e22851c3b9f281611b42b5
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.