* [PATCH] sound/oss/opl3: validate voice and channel indexes
@ 2011-03-23 15:42 Dan Rosenberg
2011-03-23 22:04 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Dan Rosenberg @ 2011-03-23 15:42 UTC (permalink / raw)
To: perex, tiwai; +Cc: alsa-devel, security, linux-kernel
User-controllable indexes for voice and channel values may cause reading
and writing beyond the bounds of their respective arrays, leading to
potentially exploitable memory corruption. Validate these indexes.
Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com>
Cc: stable@kernel.org
---
sound/oss/opl3.c | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/sound/oss/opl3.c b/sound/oss/opl3.c
index 938c48c..e9d443e 100644
--- a/sound/oss/opl3.c
+++ b/sound/oss/opl3.c
@@ -849,6 +849,10 @@ static int opl3_load_patch(int dev, int format, const char __user *addr,
static void opl3_panning(int dev, int voice, int value)
{
+
+ if (voice < 0 || voice >= devc->nr_voice)
+ return;
+
devc->voc[voice].panning = value;
}
@@ -1066,8 +1070,15 @@ static int opl3_alloc_voice(int dev, int chn, int note, struct voice_alloc_info
static void opl3_setup_voice(int dev, int voice, int chn)
{
- struct channel_info *info =
- &synth_devs[dev]->chn_info[chn];
+ struct channel_info *info;
+
+ if (voice < 0 || voice >= devc->nr_voice)
+ return;
+
+ if (chn < 0 || chn > 15)
+ return;
+
+ info = &synth_devs[dev]->chn_info[chn];
opl3_set_instr(dev, voice, info->pgm_num);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sound/oss/opl3: validate voice and channel indexes
2011-03-23 15:42 [PATCH] sound/oss/opl3: validate voice and channel indexes Dan Rosenberg
@ 2011-03-23 22:04 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2011-03-23 22:04 UTC (permalink / raw)
To: Dan Rosenberg; +Cc: perex, alsa-devel, security, linux-kernel
At Wed, 23 Mar 2011 11:42:57 -0400,
Dan Rosenberg wrote:
>
> User-controllable indexes for voice and channel values may cause reading
> and writing beyond the bounds of their respective arrays, leading to
> potentially exploitable memory corruption. Validate these indexes.
>
> Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com>
> Cc: stable@kernel.org
Applied now. Thanks.
Takashi
> ---
> sound/oss/opl3.c | 15 +++++++++++++--
> 1 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/sound/oss/opl3.c b/sound/oss/opl3.c
> index 938c48c..e9d443e 100644
> --- a/sound/oss/opl3.c
> +++ b/sound/oss/opl3.c
> @@ -849,6 +849,10 @@ static int opl3_load_patch(int dev, int format, const char __user *addr,
>
> static void opl3_panning(int dev, int voice, int value)
> {
> +
> + if (voice < 0 || voice >= devc->nr_voice)
> + return;
> +
> devc->voc[voice].panning = value;
> }
>
> @@ -1066,8 +1070,15 @@ static int opl3_alloc_voice(int dev, int chn, int note, struct voice_alloc_info
>
> static void opl3_setup_voice(int dev, int voice, int chn)
> {
> - struct channel_info *info =
> - &synth_devs[dev]->chn_info[chn];
> + struct channel_info *info;
> +
> + if (voice < 0 || voice >= devc->nr_voice)
> + return;
> +
> + if (chn < 0 || chn > 15)
> + return;
> +
> + info = &synth_devs[dev]->chn_info[chn];
>
> opl3_set_instr(dev, voice, info->pgm_num);
>
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-23 22:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-23 15:42 [PATCH] sound/oss/opl3: validate voice and channel indexes Dan Rosenberg
2011-03-23 22:04 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).