diff options
| author | Roel Kluin <roel.kluin@gmail.com> | 2009-11-16 17:05:02 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-16 17:45:50 +0100 |
| commit | 02bb57aeb092cbb0dfdb50c6026dbd0c60af7644 (patch) | |
| tree | 1e7bf3b69ac92619e56d9d15a578a5d0fd4d73ad /sound/oss | |
| parent | 0c3c35e148dbc03106038dd25816fb9f3a084d86 (diff) | |
| download | blackbird-op-linux-02bb57aeb092cbb0dfdb50c6026dbd0c60af7644.tar.gz blackbird-op-linux-02bb57aeb092cbb0dfdb50c6026dbd0c60af7644.zip | |
sound: OSS: keep index within bounds of midi_devs[]
When the {orig,midi}_dev equals num_midis, that's one too
large already.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/midi_synth.c | 2 | ||||
| -rw-r--r-- | sound/oss/mpu401.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/midi_synth.c b/sound/oss/midi_synth.c index 9e450988ed36..3bc7104c5379 100644 --- a/sound/oss/midi_synth.c +++ b/sound/oss/midi_synth.c @@ -426,7 +426,7 @@ midi_synth_open(int dev, int mode) int err; struct midi_input_info *inc; - if (orig_dev < 0 || orig_dev > num_midis || midi_devs[orig_dev] == NULL) + if (orig_dev < 0 || orig_dev >= num_midis || midi_devs[orig_dev] == NULL) return -ENXIO; midi2synth[orig_dev] = dev; diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c index 734b8f9e2f78..0af9d24feb8f 100644 --- a/sound/oss/mpu401.c +++ b/sound/oss/mpu401.c @@ -770,7 +770,7 @@ static int mpu_synth_ioctl(int dev, unsigned int cmd, void __user *arg) midi_dev = synth_devs[dev]->midi_dev; - if (midi_dev < 0 || midi_dev > num_midis || midi_devs[midi_dev] == NULL) + if (midi_dev < 0 || midi_dev >= num_midis || midi_devs[midi_dev] == NULL) return -ENXIO; devc = &dev_conf[midi_dev]; |
