Skip to content

Commit adc4bac

Browse files
tiwaigregkh
authored andcommitted
ALSA: seq: Fix OSS sysex delivery in OSS emulation
commit 132d358b183ac6ad8b3fea32ad5e0663456d18d1 upstream. The SYSEX event delivery in OSS sequencer emulation assumed that the event is encoded in the variable-length data with the straight buffering. This was the normal behavior in the past, but during the development, the chained buffers were introduced for carrying more data, while the OSS code was left intact. As a result, when a SYSEX event with the chained buffer data is passed to OSS sequencer port, it may end up with the wrong memory access, as if it were having a too large buffer. This patch addresses the bug, by applying the buffer data expansion by the generic snd_seq_dump_var_event() helper function. Reported-by: syzbot <syzkaller@googlegroups.com> Reported-by: Mark Salyzyn <salyzyn@android.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 4d5b67a commit adc4bac

3 files changed

Lines changed: 32 additions & 3 deletions

File tree

sound/core/seq/oss/seq_oss_midi.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -612,9 +612,7 @@ send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev, struct seq
612612
if (!dp->timer->running)
613613
len = snd_seq_oss_timer_start(dp->timer);
614614
if (ev->type == SNDRV_SEQ_EVENT_SYSEX) {
615-
if ((ev->flags & SNDRV_SEQ_EVENT_LENGTH_MASK) == SNDRV_SEQ_EVENT_LENGTH_VARIABLE)
616-
snd_seq_oss_readq_puts(dp->readq, mdev->seq_device,
617-
ev->data.ext.ptr, ev->data.ext.len);
615+
snd_seq_oss_readq_sysex(dp->readq, mdev->seq_device, ev);
618616
} else {
619617
len = snd_midi_event_decode(mdev->coder, msg, sizeof(msg), ev);
620618
if (len > 0)

sound/core/seq/oss/seq_oss_readq.c

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,35 @@ snd_seq_oss_readq_puts(struct seq_oss_readq *q, int dev, unsigned char *data, in
117117
return 0;
118118
}
119119

120+
/*
121+
* put MIDI sysex bytes; the event buffer may be chained, thus it has
122+
* to be expanded via snd_seq_dump_var_event().
123+
*/
124+
struct readq_sysex_ctx {
125+
struct seq_oss_readq *readq;
126+
int dev;
127+
};
128+
129+
static int readq_dump_sysex(void *ptr, void *buf, int count)
130+
{
131+
struct readq_sysex_ctx *ctx = ptr;
132+
133+
return snd_seq_oss_readq_puts(ctx->readq, ctx->dev, buf, count);
134+
}
135+
136+
int snd_seq_oss_readq_sysex(struct seq_oss_readq *q, int dev,
137+
struct snd_seq_event *ev)
138+
{
139+
struct readq_sysex_ctx ctx = {
140+
.readq = q,
141+
.dev = dev
142+
};
143+
144+
if ((ev->flags & SNDRV_SEQ_EVENT_LENGTH_MASK) != SNDRV_SEQ_EVENT_LENGTH_VARIABLE)
145+
return 0;
146+
return snd_seq_dump_var_event(ev, readq_dump_sysex, &ctx);
147+
}
148+
120149
/*
121150
* copy an event to input queue:
122151
* return zero if enqueued

sound/core/seq/oss/seq_oss_readq.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ void snd_seq_oss_readq_delete(struct seq_oss_readq *q);
4444
void snd_seq_oss_readq_clear(struct seq_oss_readq *readq);
4545
unsigned int snd_seq_oss_readq_poll(struct seq_oss_readq *readq, struct file *file, poll_table *wait);
4646
int snd_seq_oss_readq_puts(struct seq_oss_readq *readq, int dev, unsigned char *data, int len);
47+
int snd_seq_oss_readq_sysex(struct seq_oss_readq *q, int dev,
48+
struct snd_seq_event *ev);
4749
int snd_seq_oss_readq_put_event(struct seq_oss_readq *readq, union evrec *ev);
4850
int snd_seq_oss_readq_put_timestamp(struct seq_oss_readq *readq, unsigned long curt, int seq_mode);
4951
int snd_seq_oss_readq_pick(struct seq_oss_readq *q, union evrec *rec);

0 commit comments

Comments
 (0)