From: Dan Carpenter <error27@gmail.com>
To: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>,
alsa-devel@alsa-project.org, kernel-janitors@vger.kernel.org,
Dan Carpenter <error27@gmail.com>
Subject: [patch] sound/oss: potential integer overflow
Date: Wed, 8 Sep 2010 09:26:32 +0200 [thread overview]
Message-ID: <20100908072632.GB32047@bicker> (raw)
We don't want "pre_event_timeout" to be negative because that would
result in a stack traces in dmesg when we schedule a negative timeout.
In the original code "HZ * val" could overflow so I just moved the
check for negative below the multiply.
Also the code in snd_seq_oss_ioctl() deliberately set the timeout to -1
which is wrong.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c
index e85789e..de61295 100644
--- a/sound/oss/sequencer.c
+++ b/sound/oss/sequencer.c
@@ -1507,9 +1507,9 @@ int sequencer_ioctl(int dev, struct file *file, unsigned int cmd, void __user *a
case SNDCTL_MIDI_PRETIME:
if (get_user(val, p))
return -EFAULT;
+ val = (HZ * val) / 10;
if (val < 0)
val = 0;
- val = (HZ * val) / 10;
pre_event_timeout = val;
break;
diff --git a/sound/oss/midibuf.c b/sound/oss/midibuf.c
index 782b3b8..73acacd 100644
--- a/sound/oss/midibuf.c
+++ b/sound/oss/midibuf.c
@@ -380,9 +380,9 @@ int MIDIbuf_ioctl(int dev, struct file *file,
case SNDCTL_MIDI_PRETIME:
if (get_user(val, (int __user *)arg))
return -EFAULT;
+ val = (HZ * val) / 10;
if (val < 0)
val = 0;
- val = (HZ * val) / 10;
parms[dev].prech_timeout = val;
return put_user(val, (int __user *)arg);
diff --git a/sound/core/seq/oss/seq_oss_ioctl.c b/sound/core/seq/oss/seq_oss_ioctl.c
index 5ac701c..ae2a39f 100644
--- a/sound/core/seq/oss/seq_oss_ioctl.c
+++ b/sound/core/seq/oss/seq_oss_ioctl.c
@@ -191,10 +191,9 @@ snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long ca
return 0;
if (get_user(val, p))
return -EFAULT;
- if (val <= 0)
- val = -1;
- else
- val = (HZ * val) / 10;
+ val = (HZ * val) / 10;
+ if (val < 0)
+ val = 0;
dp->readq->pre_event_timeout = val;
return put_user(val, p) ? -EFAULT : 0;
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <error27@gmail.com>
To: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>,
alsa-devel@alsa-project.org, kernel-janitors@vger.kernel.org,
Dan Carpenter <error27@gmail.com>
Subject: [patch] sound/oss: potential integer overflow
Date: Wed, 08 Sep 2010 07:26:32 +0000 [thread overview]
Message-ID: <20100908072632.GB32047@bicker> (raw)
We don't want "pre_event_timeout" to be negative because that would
result in a stack traces in dmesg when we schedule a negative timeout.
In the original code "HZ * val" could overflow so I just moved the
check for negative below the multiply.
Also the code in snd_seq_oss_ioctl() deliberately set the timeout to -1
which is wrong.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c
index e85789e..de61295 100644
--- a/sound/oss/sequencer.c
+++ b/sound/oss/sequencer.c
@@ -1507,9 +1507,9 @@ int sequencer_ioctl(int dev, struct file *file, unsigned int cmd, void __user *a
case SNDCTL_MIDI_PRETIME:
if (get_user(val, p))
return -EFAULT;
+ val = (HZ * val) / 10;
if (val < 0)
val = 0;
- val = (HZ * val) / 10;
pre_event_timeout = val;
break;
diff --git a/sound/oss/midibuf.c b/sound/oss/midibuf.c
index 782b3b8..73acacd 100644
--- a/sound/oss/midibuf.c
+++ b/sound/oss/midibuf.c
@@ -380,9 +380,9 @@ int MIDIbuf_ioctl(int dev, struct file *file,
case SNDCTL_MIDI_PRETIME:
if (get_user(val, (int __user *)arg))
return -EFAULT;
+ val = (HZ * val) / 10;
if (val < 0)
val = 0;
- val = (HZ * val) / 10;
parms[dev].prech_timeout = val;
return put_user(val, (int __user *)arg);
diff --git a/sound/core/seq/oss/seq_oss_ioctl.c b/sound/core/seq/oss/seq_oss_ioctl.c
index 5ac701c..ae2a39f 100644
--- a/sound/core/seq/oss/seq_oss_ioctl.c
+++ b/sound/core/seq/oss/seq_oss_ioctl.c
@@ -191,10 +191,9 @@ snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long ca
return 0;
if (get_user(val, p))
return -EFAULT;
- if (val <= 0)
- val = -1;
- else
- val = (HZ * val) / 10;
+ val = (HZ * val) / 10;
+ if (val < 0)
+ val = 0;
dp->readq->pre_event_timeout = val;
return put_user(val, p) ? -EFAULT : 0;
next reply other threads:[~2010-09-08 7:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-08 7:26 Dan Carpenter [this message]
2010-09-08 7:26 ` [patch] sound/oss: potential integer overflow Dan Carpenter
2010-09-08 7:54 ` Takashi Iwai
2010-09-08 7:54 ` Takashi Iwai
2010-09-08 9:50 ` walter harms
2010-09-08 9:50 ` walter harms
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=20100908072632.GB32047@bicker \
--to=error27@gmail.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.