Subject: [PATCH] [UBUNTU:sound/pci/emu10k1/] #34831: Fix
remaining instances of improper error propagation for
nonexistent mpu401 interfaces
UpstreamStatus: Not merged
This patch fixes the remaining instances in our tree where a
non-
existent mpu401 interface can cause a hard freeze when i/o
is issued.
This commit closes Malone #34831.
Signed-off-by: Daniel T Chen <crimsun ubuntu.com>
---
sound/pci/emu10k1/emu10k1x.c | 35
+++++++++++++++++++++++++++--------
sound/pci/emu10k1/emumpu401.c | 35
+++++++++++++++++++++++++++--------
2 files changed, 54 insertions(+), 16 deletions(-)
5a7c7f597402747b3946afe70c384c6d514857da
diff --git a/sound/pci/emu10k1/emu10k1x.c
b/sound/pci/emu10k1/emu10k1x.c
index 7955777..bd7e6ca 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
-1298,7
+1298,7 static void snd_emu10k1x_midi_interrupt(
do_emu10k1x_midi_interrupt(emu, &emu->midi,
status);
}
-static void snd_emu10k1x_midi_cmd(emu10k1x_t * emu,
emu10k1x_midi_t *midi, unsigned char cmd, int ack)
+static int snd_emu10k1x_midi_cmd(emu10k1x_t * emu,
emu10k1x_midi_t *midi, unsigned char cmd, int ack)
{
unsigned long flags;
int timeout, ok;
-1323,11
+1323,14 static void snd_emu10k1x_midi_cmd(emu10k
ok = 1;
}
spin_unlock_irqrestore(&midi->input_lock, flags);
- if (!ok)
+ if (!ok) {
snd_printk(KERN_ERR "midi_cmd: 0x%x failed at 0x%lx
(status = 0x%x, data = 0x%x)!!!\n",
cmd, emu->port,
mpu401_read_stat(emu, midi),
mpu401_read_data(emu, midi));
+ return 1;
+ }
+ return 0;
}
static int
snd_emu10k1x_midi_input_open(snd_rawmidi_substream_t *
substream)
-1343,12
+1346,17 static int snd_emu10k1x_midi_input_open(
midi->substream_input = substream;
if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT))
{
spin_unlock_irqrestore(&midi->open_lock, flags);
- snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1);
- snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1);
+ if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1))
+ goto error_out;
+ if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART,
1))
+ goto error_out;
} else {
spin_unlock_irqrestore(&midi->open_lock, flags);
}
return 0;
+
+error_out:
+ return -EIO;
}
static int
snd_emu10k1x_midi_output_open(snd_rawmidi_substream_t *
substream)
-1364,12
+1372,17 static int snd_emu10k1x_midi_output_open
midi->substream_output = substream;
if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT))
{
spin_unlock_irqrestore(&midi->open_lock, flags);
- snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1);
- snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1);
+ if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1))
+ goto error_out;
+ if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART,
1))
+ goto error_out;
} else {
spin_unlock_irqrestore(&midi->open_lock, flags);
}
return 0;
+
+error_out:
+ return -EIO;
}
static int
snd_emu10k1x_midi_input_close(snd_rawmidi_substream_t *
substream)
-1377,6
+1390,7 static int snd_emu10k1x_midi_input_close
emu10k1x_t *emu;
emu10k1x_midi_t *midi = (emu10k1x_midi_t
*)substream->rmidi->private_data;
unsigned long flags;
+ int err = 0;
emu = midi->emu;
snd_assert(emu, return -ENXIO);
-1386,10
+1400,12 static int snd_emu10k1x_midi_input_close
midi->substream_input = NULL;
if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT))
{
spin_unlock_irqrestore(&midi->open_lock, flags);
- snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
+ err = snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
} else {
spin_unlock_irqrestore(&midi->open_lock, flags);
}
+ if (err)
+ return -EIO;
return 0;
}
-1398,6
+1414,7 static int snd_emu10k1x_midi_output_clos
emu10k1x_t *emu;
emu10k1x_midi_t *midi = (emu10k1x_midi_t
*)substream->rmidi->private_data;
unsigned long flags;
+ int err = 0;
emu = midi->emu;
snd_assert(emu, return -ENXIO);
-1407,10
+1424,12 static int snd_emu10k1x_midi_output_clos
midi->substream_output = NULL;
if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT))
{
spin_unlock_irqrestore(&midi->open_lock, flags);
- snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
+ err = snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
} else {
spin_unlock_irqrestore(&midi->open_lock, flags);
}
+ if (err)
+ return -EIO;
return 0;
}
diff --git a/sound/pci/emu10k1/emumpu401.c
b/sound/pci/emu10k1/emumpu401.c
index eb57458..23575ba 100644
--- a/sound/pci/emu10k1/emumpu401.c
+++ b/sound/pci/emu10k1/emumpu401.c
-114,7
+114,7 static void snd_emu10k1_midi_interrupt2(
do_emu10k1_midi_interrupt(emu, &emu->midi2,
status);
}
-static void snd_emu10k1_midi_cmd(emu10k1_t * emu,
emu10k1_midi_t *midi, unsigned char cmd, int ack)
+static int snd_emu10k1_midi_cmd(emu10k1_t * emu,
emu10k1_midi_t *midi, unsigned char cmd, int ack)
{
unsigned long flags;
int timeout, ok;
-139,11
+139,14 static void snd_emu10k1_midi_cmd(emu10k1
ok = 1;
}
spin_unlock_irqrestore(&midi->input_lock, flags);
- if (!ok)
+ if (!ok) {
snd_printk(KERN_ERR "midi_cmd: 0x%x failed at 0x%lx
(status = 0x%x, data = 0x%x)!!!\n",
cmd, emu->port,
mpu401_read_stat(emu, midi),
mpu401_read_data(emu, midi));
+ return 1;
+ }
+ return 0;
}
static int
snd_emu10k1_midi_input_open(snd_rawmidi_substream_t *
substream)
-159,12
+162,17 static int snd_emu10k1_midi_input_open(s
midi->substream_input = substream;
if (!(midi->midi_mode & EMU10K1_MIDI_MODE_OUTPUT))
{
spin_unlock_irqrestore(&midi->open_lock, flags);
- snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1);
- snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART, 1);
+ if (snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1))
+ goto error_out;
+ if (snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART,
1))
+ goto error_out;
} else {
spin_unlock_irqrestore(&midi->open_lock, flags);
}
return 0;
+
+error_out:
+ return -EIO;
}
static int
snd_emu10k1_midi_output_open(snd_rawmidi_substream_t *
substream)
-180,12
+188,17 static int snd_emu10k1_midi_output_open(
midi->substream_output = substream;
if (!(midi->midi_mode & EMU10K1_MIDI_MODE_INPUT)) {
spin_unlock_irqrestore(&midi->open_lock, flags);
- snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1);
- snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART, 1);
+ if (snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1))
+ goto error_out;
+ if (snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART,
1))
+ goto error_out;
} else {
spin_unlock_irqrestore(&midi->open_lock, flags);
}
return 0;
+
+error_out:
+ return -EIO;
}
static int
snd_emu10k1_midi_input_close(snd_rawmidi_substream_t *
substream)
-193,6
+206,7 static int snd_emu10k1_midi_input_close(
emu10k1_t *emu;
emu10k1_midi_t *midi = (emu10k1_midi_t
*)substream->rmidi->private_data;
unsigned long flags;
+ int err = 0;
emu = midi->emu;
snd_assert(emu, return -ENXIO);
-202,10
+216,12 static int snd_emu10k1_midi_input_close(
midi->substream_input = NULL;
if (!(midi->midi_mode & EMU10K1_MIDI_MODE_OUTPUT))
{
spin_unlock_irqrestore(&midi->open_lock, flags);
- snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
+ err = snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
} else {
spin_unlock_irqrestore(&midi->open_lock, flags);
}
+ if (err)
+ return -EIO;
return 0;
}
-214,6
+230,7 static int snd_emu10k1_midi_output_close
emu10k1_t *emu;
emu10k1_midi_t *midi = (emu10k1_midi_t
*)substream->rmidi->private_data;
unsigned long flags;
+ int err = 0;
emu = midi->emu;
snd_assert(emu, return -ENXIO);
-223,10
+240,12 static int snd_emu10k1_midi_output_close
midi->substream_output = NULL;
if (!(midi->midi_mode & EMU10K1_MIDI_MODE_INPUT)) {
spin_unlock_irqrestore(&midi->open_lock, flags);
- snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
+ err = snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
} else {
spin_unlock_irqrestore(&midi->open_lock, flags);
}
+ if (err)
+ return -EIO;
return 0;
}
--
1.1.3
--
Daniel T. Chen crimsunubuntu.com
GPG key: www.sh.nu/~crimsun/pubkey.gpg.asc
--
kernel-team mailing list
kernel-teamlists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
|