summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2025-04-29 14:48:41 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-05-09 09:44:00 +0200
commitce4f77bef276e7d2eb7ab03a5d08bcbaa40710ec (patch)
tree9c51dc3629e270afa241a94a125c2fb042994520 /include/sound
parenteae60cfe25d022d7f0321dba4cc23ad8e87ade48 (diff)
downloadlinux-ce4f77bef276e7d2eb7ab03a5d08bcbaa40710ec.tar.gz
linux-ce4f77bef276e7d2eb7ab03a5d08bcbaa40710ec.tar.bz2
linux-ce4f77bef276e7d2eb7ab03a5d08bcbaa40710ec.zip
ALSA: ump: Fix buffer overflow at UMP SysEx message conversion
[ Upstream commit 56f1f30e6795b890463d9b20b11e576adf5a2f77 ] The conversion function from MIDI 1.0 to UMP packet contains an internal buffer to keep the incoming MIDI bytes, and its size is 4, as it was supposed to be the max size for a MIDI1 UMP packet data. However, the implementation overlooked that SysEx is handled in a different format, and it can be up to 6 bytes, as found in do_convert_to_ump(). It leads eventually to a buffer overflow, and may corrupt the memory when a longer SysEx message is received. The fix is simply to extend the buffer size to 6 to fit with the SysEx UMP message. Fixes: 0b5288f5fe63 ("ALSA: ump: Add legacy raw MIDI support") Reported-by: Argusee <vr@darknavy.com> Link: https://patch.msgid.link/20250429124845.25128-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/ump_convert.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/ump_convert.h b/include/sound/ump_convert.h
index d099ae27f849..682499b871ea 100644
--- a/include/sound/ump_convert.h
+++ b/include/sound/ump_convert.h
@@ -19,7 +19,7 @@ struct ump_cvt_to_ump_bank {
/* context for converting from MIDI1 byte stream to UMP packet */
struct ump_cvt_to_ump {
/* MIDI1 intermediate buffer */
- unsigned char buf[4];
+ unsigned char buf[6]; /* up to 6 bytes for SysEx */
int len;
int cmd_bytes;