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>

diff --git a/sound/oss/midi_synth.c b/sound/oss/midi_synth.c
index 9e450988ed36eb91e6b1b35783e06c14a8343f65..3bc7104c5379bbe96c792bdcc8297c13198697b3 100644 (file)
--- 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 734b8f9e2f788a36ac54eccf680a02f32eb37a75..0af9d24feb8fbbb47e8cfa41312a0aeff6f3ac4c 100644 (file)
--- 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];