fix potential NULL pointer deref in snd_sb8dsp_midi_interrupt()
PATCH 1/1 fix potential NULL pointer deref in snd_sb8dsp_midi_interrupt()
First testing if a pointer is NULL and if it is (or might be), proceeding with code that dereferences that same pointer is clearly a mistake. This happens in sound/isa/sb/sb8_midi.c::snd_sb8dsp_midi_interrupt() The patch below reworks the code so this unfortunate case doesn't happen. Also remove some blank comments.
Found by the Coverity checker as bug #367
Patch is compile testted only due to lack of hardware.
---
sound/isa/sb/sb8_midi.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-)
sound/isa/sb/sb8_midi.c +7 -13
@@ -32,20 +32,22 @@#include <sound/core.h> #include <sound/sb.h> -/* -*/ - -irqreturn_t snd_sb8dsp_midi_interrupt (struct snd_sb * chip) +irqreturn_t snd_sb8dsp_midi_interrupt (struct snd_sb *chip) {struct snd_rawmidi *rmidi;int max =64 ;char byte; -if (chip ==NULL || (rmidi = chip->rmidi) ==NULL ) { +if (!chip) +return IRQ_NONE ; + + rmidi = chip->rmidi; +if (!rmidi) {inb (SBP (chip,DATA_AVAIL ));/* ack interrupt */ return IRQ_NONE ; } +spin_lock (&chip->midi_input_lock);while (max-- >0 ) {if (inb (SBP (chip,DATA_AVAIL )) &0x80 ) {
@@ -59,10 +61,6 @@ irqreturn_t snd_sb8dsp_midi_interrupt(streturn IRQ_HANDLED ; } -/* - -*/ -static int snd_sb8dsp_midi_input_open (struct snd_rawmidi_substream *substream) {unsigned long flags;
@@ -252,10 +250,6 @@ static void snd_sb8dsp_midi_output_triggsnd_sb8dsp_midi_output_write (substream); } -/* - -*/ -static struct snd_rawmidi_ops snd_sb8dsp_midi_output = { .open = snd_sb8dsp_midi_output_open,
Quoted 4 lines · Jesper Juhl
First testing if a pointer is NULL and if it is (or might be), proceeding with code that dereferences that same pointer is clearly a mistake. This happens in sound/isa/sb/sb8_midi.c::snd_sb8dsp_midi_interrupt() The patch below reworks the code so this unfortunate case doesn't happen.
All callers of snd_sb8dsp_midi_interrupt() dereference "chip" right before calling.
Quoted 18 lines
sound/isa/sb/sb8_midi.c +6
-2-irqreturn_t snd_sb8dsp_midi_interrupt (struct snd_sb * chip) +irqreturn_t snd_sb8dsp_midi_interrupt (struct snd_sb *chip) {struct snd_rawmidi *rmidi;int max =64 ;char byte; -if (chip ==NULL || (rmidi = chip->rmidi) ==NULL ) { +if (!chip) +return IRQ_NONE ; + + rmidi = chip->rmidi; +if (!rmidi) {inb (SBP (chip,DATA_AVAIL ));/* ack interrupt */ return IRQ_NONE ; }
Quoted 8 lines · Alexey Dobriyan
Quoted 4 lines · Jesper Juhl
First testing if a pointer is NULL and if it is (or might be), proceeding with code that dereferences that same pointer is clearly a mistake. This happens in sound/isa/sb/sb8_midi.c::snd_sb8dsp_midi_interrupt() The patch below reworks the code so this unfortunate case doesn't happen.
All callers of
snd_sb8dsp_midi_interrupt()dereference "chip" right before calling.
So the "if (chip == NULL)" part should be removed to avoid confusion.
Quoted 10 lines
Quoted 10 lines
sound/isa/sb/sb8_midi.c +1
-1-irqreturn_t snd_sb8dsp_midi_interrupt (struct snd_sb * chip) +irqreturn_t snd_sb8dsp_midi_interrupt (struct snd_sb *chip) {struct snd_rawmidi *rmidi;int max =64 ;char byte;
Quoted 9 lines
sound/isa/sb/sb8_midi.c line 49
Quoted 9 lines
sound/isa/sb/sb8_midi.c +5
-1-if (chip ==NULL || (rmidi = chip->rmidi) ==NULL ) { +if (!chip) +return IRQ_NONE ; + + rmidi = chip->rmidi; +if (!rmidi) {inb (SBP (chip,DATA_AVAIL ));/* ack interrupt */ return IRQ_NONE ; }
Willy