diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-03-09 10:59:22 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-03-09 11:00:45 +0100 |
| commit | d683469b3c93d7e2afd39e6e1970f24700eb7a68 (patch) | |
| tree | b103ebcbd4c8d22ffd5c6642b80b47fb0011aa88 /sound/usb/line6/midibuf.c | |
| parent | ALSA: pcm: oss: Avoid plugin buffer overflow (diff) | |
| download | linux-dev-d683469b3c93d7e2afd39e6e1970f24700eb7a68.tar.xz linux-dev-d683469b3c93d7e2afd39e6e1970f24700eb7a68.zip | |
ALSA: line6: Fix endless MIDI read loop
The MIDI input event parser of the LINE6 driver may enter into an
endless loop when the unexpected data sequence is given, as it tries
to continue the secondary bytes without termination. Also, when the
input data is too short, the parser returns a negative error, while
the caller doesn't handle it properly. This would lead to the
unexpected behavior as well.
This patch addresses those issues by checking the return value
correctly and handling the one-byte event in the parser properly.
The bug was reported by syzkaller.
Reported-by: syzbot+cce32521ee0a824c21f7@syzkaller.appspotmail.com
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/000000000000033087059f8f8fa3@google.com
Link: https://lore.kernel.org/r/20200309095922.30269-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to '')
| -rw-r--r-- | sound/usb/line6/midibuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/line6/midibuf.c b/sound/usb/line6/midibuf.c index 8d6eefa0d936..6a70463f82c4 100644 --- a/sound/usb/line6/midibuf.c +++ b/sound/usb/line6/midibuf.c @@ -159,7 +159,7 @@ int line6_midibuf_read(struct midi_buffer *this, unsigned char *data, int midi_length_prev = midibuf_message_length(this->command_prev); - if (midi_length_prev > 0) { + if (midi_length_prev > 1) { midi_length = midi_length_prev - 1; repeat = 1; } else |