From: Dan Carpenter <dan.carpenter@oracle.com>
To: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>,
alsa-devel@alsa-project.org, kernel-janitors@vger.kernel.org
Subject: [patch v2] ALSA: opl3: small array underflow
Date: Tue, 3 Mar 2015 22:13:18 +0300 [thread overview]
Message-ID: <20150303191318.GA7569@mwanda> (raw)
In-Reply-To: <54F5993E.7000109@ladisch.de>
We don't check for negatives so "pitchbend" can be SHRT_MIN here. It
means that we can read up to 6 elements before the start of the
opl3_note_table[] array.
There are several ways we could fix this. I have gone with what is
maybe the lazier approach of just changing negative values to zero.
Hopefully, people aren't passing negatives here anyway.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: The first patch just chan->midi_pitchbend unsigned but Clemens
Ladisch pointed out that that breaks the API.
diff --git a/sound/drivers/opl3/opl3_midi.c b/sound/drivers/opl3/opl3_midi.c
index f62780e..0cb91dc 100644
--- a/sound/drivers/opl3/opl3_midi.c
+++ b/sound/drivers/opl3/opl3_midi.c
@@ -105,6 +105,8 @@ static void snd_opl3_calc_pitch(unsigned char *fnum, unsigned char *blocknum,
int pitchbend = chan->midi_pitchbend;
int segment;
+ if (pitchbend < 0)
+ pitchbend = 0;
if (pitchbend > 0x1FFF)
pitchbend = 0x1FFF;
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>,
alsa-devel@alsa-project.org, kernel-janitors@vger.kernel.org
Subject: [patch v2] ALSA: opl3: small array underflow
Date: Tue, 03 Mar 2015 19:13:18 +0000 [thread overview]
Message-ID: <20150303191318.GA7569@mwanda> (raw)
In-Reply-To: <54F5993E.7000109@ladisch.de>
We don't check for negatives so "pitchbend" can be SHRT_MIN here. It
means that we can read up to 6 elements before the start of the
opl3_note_table[] array.
There are several ways we could fix this. I have gone with what is
maybe the lazier approach of just changing negative values to zero.
Hopefully, people aren't passing negatives here anyway.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: The first patch just chan->midi_pitchbend unsigned but Clemens
Ladisch pointed out that that breaks the API.
diff --git a/sound/drivers/opl3/opl3_midi.c b/sound/drivers/opl3/opl3_midi.c
index f62780e..0cb91dc 100644
--- a/sound/drivers/opl3/opl3_midi.c
+++ b/sound/drivers/opl3/opl3_midi.c
@@ -105,6 +105,8 @@ static void snd_opl3_calc_pitch(unsigned char *fnum, unsigned char *blocknum,
int pitchbend = chan->midi_pitchbend;
int segment;
+ if (pitchbend < 0)
+ pitchbend = 0;
if (pitchbend > 0x1FFF)
pitchbend = 0x1FFF;
next prev parent reply other threads:[~2015-03-03 19:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-03 9:38 [patch] ALSA: seq_midi_emul: small array underflow Dan Carpenter
2015-03-03 9:38 ` Dan Carpenter
2015-03-03 11:21 ` [alsa-devel] " Clemens Ladisch
2015-03-03 11:21 ` Clemens Ladisch
2015-03-03 11:38 ` Dan Carpenter
2015-03-03 11:38 ` Dan Carpenter
2015-03-03 19:13 ` Dan Carpenter [this message]
2015-03-03 19:13 ` [patch v2] ALSA: opl3: " Dan Carpenter
2015-03-03 20:59 ` [alsa-devel] " Clemens Ladisch
2015-03-03 20:59 ` Clemens Ladisch
2015-03-03 21:06 ` Dan Carpenter
2015-03-03 21:06 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150303191318.GA7569@mwanda \
--to=dan.carpenter@oracle.com \
--cc=alsa-devel@alsa-project.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.