Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 02bb57aeb092cbb0dfdb50c6026dbd0c60af7644

Authored by Roel Kluin
Committed by Takashi Iwai
1 parent 0c3c35e148
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

sound/oss/midi_synth.c
Diff comments   View file @ 02bb57a
... ... @@ -426,7 +426,7 @@
426 426 int err;
427 427 struct midi_input_info *inc;
428 428  
429   - if (orig_dev < 0 || orig_dev > num_midis || midi_devs[orig_dev] == NULL)
  429 + if (orig_dev < 0 || orig_dev >= num_midis || midi_devs[orig_dev] == NULL)
430 430 return -ENXIO;
431 431  
432 432 midi2synth[orig_dev] = dev;
... ... @@ -770,7 +770,7 @@
770 770  
771 771 midi_dev = synth_devs[dev]->midi_dev;
772 772  
773   - if (midi_dev < 0 || midi_dev > num_midis || midi_devs[midi_dev] == NULL)
  773 + if (midi_dev < 0 || midi_dev >= num_midis || midi_devs[midi_dev] == NULL)
774 774 return -ENXIO;
775 775  
776 776 devc = &dev_conf[midi_dev];