|
Takashi Iwai |
42dc9c |
From 2f7a26abb8241a0208c68d22815aa247c5ddacab Mon Sep 17 00:00:00 2001
|
|
Takashi Iwai |
42dc9c |
From: "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
|
|
Takashi Iwai |
42dc9c |
Date: Sat, 9 Apr 2022 03:26:55 +0200
|
|
Takashi Iwai |
42dc9c |
Subject: [PATCH] ALSA: pcm: Test for "silence" field in struct "pcm_format_data"
|
|
Takashi Iwai |
42dc9c |
Git-commit: 2f7a26abb8241a0208c68d22815aa247c5ddacab
|
|
Takashi Iwai |
42dc9c |
Patch-mainline: v5.18-rc3
|
|
Takashi Iwai |
42dc9c |
References: git-fixes
|
|
Takashi Iwai |
42dc9c |
|
|
Takashi Iwai |
42dc9c |
Syzbot reports "KASAN: null-ptr-deref Write in
|
|
Takashi Iwai |
42dc9c |
snd_pcm_format_set_silence".[1]
|
|
Takashi Iwai |
42dc9c |
|
|
Takashi Iwai |
42dc9c |
It is due to missing validation of the "silence" field of struct
|
|
Takashi Iwai |
42dc9c |
"pcm_format_data" in "pcm_formats" array.
|
|
Takashi Iwai |
42dc9c |
|
|
Takashi Iwai |
42dc9c |
Add a test for valid "pat" and, if it is not so, return -EINVAL.
|
|
Takashi Iwai |
42dc9c |
|
|
Takashi Iwai |
42dc9c |
[1] https://lore.kernel.org/lkml/000000000000d188ef05dc2c7279@google.com/
|
|
Takashi Iwai |
42dc9c |
|
|
Takashi Iwai |
42dc9c |
Reported-and-tested-by: syzbot+205eb15961852c2c5974@syzkaller.appspotmail.com
|
|
Takashi Iwai |
42dc9c |
Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
|
|
Takashi Iwai |
42dc9c |
Cc: <stable@vger.kernel.org>
|
|
Takashi Iwai |
42dc9c |
Link: https://lore.kernel.org/r/20220409012655.9399-1-fmdefrancesco@gmail.com
|
|
Takashi Iwai |
42dc9c |
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
Takashi Iwai |
42dc9c |
|
|
Takashi Iwai |
42dc9c |
---
|
|
Takashi Iwai |
42dc9c |
sound/core/pcm_misc.c | 2 +-
|
|
Takashi Iwai |
42dc9c |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Takashi Iwai |
42dc9c |
|
|
Takashi Iwai |
42dc9c |
diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c
|
|
Takashi Iwai |
42dc9c |
index 4866aed97aac..5588b6a1ee8b 100644
|
|
Takashi Iwai |
42dc9c |
--- a/sound/core/pcm_misc.c
|
|
Takashi Iwai |
42dc9c |
+++ b/sound/core/pcm_misc.c
|
|
Takashi Iwai |
42dc9c |
@@ -433,7 +433,7 @@ int snd_pcm_format_set_silence(snd_pcm_format_t format, void *data, unsigned int
|
|
Takashi Iwai |
42dc9c |
return 0;
|
|
Takashi Iwai |
42dc9c |
width = pcm_formats[(INT)format].phys; /* physical width */
|
|
Takashi Iwai |
42dc9c |
pat = pcm_formats[(INT)format].silence;
|
|
Takashi Iwai |
42dc9c |
- if (! width)
|
|
Takashi Iwai |
42dc9c |
+ if (!width || !pat)
|
|
Takashi Iwai |
42dc9c |
return -EINVAL;
|
|
Takashi Iwai |
42dc9c |
/* signed or 1 byte data */
|
|
Takashi Iwai |
42dc9c |
if (pcm_formats[(INT)format].signd == 1 || width <= 8) {
|
|
Takashi Iwai |
42dc9c |
--
|
|
Takashi Iwai |
42dc9c |
2.31.1
|
|
Takashi Iwai |
42dc9c |
|