Skip to contentSkip to conversation

ALSA: seq: Fix running status after receiving sysex

PATCH New Takashi Iwai 1 participant 3 messages Mar 16, 2020 Sound

lore
Share & tools
lore
#0 lore raw

cover ALSA: seq: Fix running status after receiving sysex

Hi,

here are two small fixes for correcting the behavior of sequencer core wrt the event decoding after receiving a sysex message.

Takashi

===

Takashi Iwai (2):
ALSA: seq: virmidi: Fix running status after receiving sysex
ALSA: seq: oss: Fix running status after receiving sysex

 sound/core/seq/oss/seq_oss_midi.c | 1 +
 sound/core/seq/seq_virmidi.c      | 1 +
 2 files changed, 2 insertions(+)
Signature · 1 line
2.16.4
#1 lore raw

PATCH 1/2 ALSA: seq: virmidi: Fix running status after receiving sysex

The virmidi driver handles sysex event exceptionally in a short-cut snd_seq_dump_var_event() call, but this missed the reset of the running status. As a result, it may lead to an incomplete command right after the sysex when an event with the same running status was queued.

Fix it by clearing the running status properly via alling snd_midi_event_reset_decode() for that code path.

---
 sound/core/seq/seq_virmidi.c | 1 +
 1 file changed, 1 insertion(+)
sound/core/seq/seq_virmidi.c +1 -0
index 626d87c1539b..77d7037d1476 100644
@@ -81,6 +81,7 @@ static int snd_virmidi_dev_receive_event(struct snd_virmidi_dev *rdev,
 			if ((ev->flags & SNDRV_SEQ_EVENT_LENGTH_MASK) != SNDRV_SEQ_EVENT_LENGTH_VARIABLE)
 				continue;
 			snd_seq_dump_var_event(ev, (snd_seq_dump_func_t)snd_rawmidi_receive, vmidi->substream);
+			snd_midi_event_reset_decode(vmidi->parser);
 		} else {
 			len = snd_midi_event_decode(vmidi->parser, msg, sizeof(msg), ev);
 			if (len > 0)
Signature · 1 line
2.16.4
#2 lore raw

PATCH 2/2 ALSA: seq: oss: Fix running status after receiving sysex

In reply to Takashi Iwai

This is a similar bug like the previous case for virmidi: the invalid running status is kept after receiving a sysex message.

Again the fix is to clear the running status after handling the sysex.

---
 sound/core/seq/oss/seq_oss_midi.c | 1 +
 1 file changed, 1 insertion(+)
sound/core/seq/oss/seq_oss_midi.c +1 -0
index a88c235b2ea3..2ddfe2226651 100644
@@ -602,6 +602,7 @@ send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev, struct seq
 		len = snd_seq_oss_timer_start(dp->timer);
 	if (ev->type == SNDRV_SEQ_EVENT_SYSEX) {
 		snd_seq_oss_readq_sysex(dp->readq, mdev->seq_device, ev);
+		snd_midi_event_reset_decode(mdev->coder);
 	} else {
 		len = snd_midi_event_decode(mdev->coder, msg, sizeof(msg), ev);
 		if (len > 0)
Signature · 1 line
2.16.4