|
Takashi Iwai |
901449 |
From df02234e6b87d2a9a82acd3198e44bdeff8488c6 Mon Sep 17 00:00:00 2001
|
|
Takashi Iwai |
901449 |
From: Clement Lecigne <clecigne@google.com>
|
|
Takashi Iwai |
901449 |
Date: Fri, 13 Jan 2023 13:07:45 +0100
|
|
Takashi Iwai |
901449 |
Subject: [PATCH] ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF
|
|
Takashi Iwai |
901449 |
Git-commit: 56b88b50565cd8b946a2d00b0c83927b7ebb055e
|
|
Takashi Iwai |
901449 |
Alt-commit: df02234e6b87d2a9a82acd3198e44bdeff8488c6
|
|
Takashi Iwai |
901449 |
Patch-mainline: v6.2-rc4
|
|
Takashi Iwai |
901449 |
References: CVE-2023-0266 bsc#1207134
|
|
Takashi Iwai |
901449 |
|
|
Takashi Iwai |
901449 |
[ Note: this is a fix that works around the bug equivalently as the
|
|
Takashi Iwai |
901449 |
two upstream commits:
|
|
Takashi Iwai |
901449 |
1fa4445f9adf ("ALSA: control - introduce snd_ctl_notify_one() helper")
|
|
Takashi Iwai |
901449 |
56b88b50565c ("ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF")
|
|
Takashi Iwai |
901449 |
but in a simpler way to fit with older stable trees -- tiwai ]
|
|
Takashi Iwai |
901449 |
|
|
Takashi Iwai |
901449 |
Add missing locking in ctl_elem_read_user/ctl_elem_write_user which can be
|
|
Takashi Iwai |
901449 |
easily triggered and turned into an use-after-free.
|
|
Takashi Iwai |
901449 |
|
|
Takashi Iwai |
901449 |
Example code paths with SNDRV_CTL_IOCTL_ELEM_READ:
|
|
Takashi Iwai |
901449 |
|
|
Takashi Iwai |
901449 |
64-bits:
|
|
Takashi Iwai |
901449 |
snd_ctl_ioctl
|
|
Takashi Iwai |
901449 |
snd_ctl_elem_read_user
|
|
Takashi Iwai |
901449 |
[takes controls_rwsem]
|
|
Takashi Iwai |
901449 |
snd_ctl_elem_read [lock properly held, all good]
|
|
Takashi Iwai |
901449 |
[drops controls_rwsem]
|
|
Takashi Iwai |
901449 |
|
|
Takashi Iwai |
901449 |
32-bits (compat):
|
|
Takashi Iwai |
901449 |
snd_ctl_ioctl_compat
|
|
Takashi Iwai |
901449 |
snd_ctl_elem_write_read_compat
|
|
Takashi Iwai |
901449 |
ctl_elem_write_read
|
|
Takashi Iwai |
901449 |
snd_ctl_elem_read [missing lock, not good]
|
|
Takashi Iwai |
901449 |
|
|
Takashi Iwai |
901449 |
CVE-2023-0266 was assigned for this issue.
|
|
Takashi Iwai |
901449 |
|
|
Takashi Iwai |
901449 |
Signed-off-by: Clement Lecigne <clecigne@google.com>
|
|
Takashi Iwai |
901449 |
Cc: stable@kernel.org # 5.12 and older
|
|
Takashi Iwai |
901449 |
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
Takashi Iwai |
901449 |
Reviewed-by: Jaroslav Kysela <perex@perex.cz>
|
|
Takashi Iwai |
901449 |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Takashi Iwai |
901449 |
|
|
Takashi Iwai |
901449 |
---
|
|
Takashi Iwai |
901449 |
sound/core/control_compat.c | 4 ++++
|
|
Takashi Iwai |
901449 |
1 file changed, 4 insertions(+)
|
|
Takashi Iwai |
901449 |
|
|
Takashi Iwai |
901449 |
diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c
|
|
Takashi Iwai |
901449 |
index 97467f6a32a1..980ab3580f1b 100644
|
|
Takashi Iwai |
901449 |
--- a/sound/core/control_compat.c
|
|
Takashi Iwai |
901449 |
+++ b/sound/core/control_compat.c
|
|
Takashi Iwai |
901449 |
@@ -304,7 +304,9 @@ static int ctl_elem_read_user(struct snd_card *card,
|
|
Takashi Iwai |
901449 |
err = snd_power_wait(card, SNDRV_CTL_POWER_D0);
|
|
Takashi Iwai |
901449 |
if (err < 0)
|
|
Takashi Iwai |
901449 |
goto error;
|
|
Takashi Iwai |
901449 |
+ down_read(&card->controls_rwsem);
|
|
Takashi Iwai |
901449 |
err = snd_ctl_elem_read(card, data);
|
|
Takashi Iwai |
901449 |
+ up_read(&card->controls_rwsem);
|
|
Takashi Iwai |
901449 |
if (err < 0)
|
|
Takashi Iwai |
901449 |
goto error;
|
|
Takashi Iwai |
901449 |
err = copy_ctl_value_to_user(userdata, valuep, data, type, count);
|
|
Takashi Iwai |
901449 |
@@ -332,7 +334,9 @@ static int ctl_elem_write_user(struct snd_ctl_file *file,
|
|
Takashi Iwai |
901449 |
err = snd_power_wait(card, SNDRV_CTL_POWER_D0);
|
|
Takashi Iwai |
901449 |
if (err < 0)
|
|
Takashi Iwai |
901449 |
goto error;
|
|
Takashi Iwai |
901449 |
+ down_write(&card->controls_rwsem);
|
|
Takashi Iwai |
901449 |
err = snd_ctl_elem_write(card, file, data);
|
|
Takashi Iwai |
901449 |
+ up_write(&card->controls_rwsem);
|
|
Takashi Iwai |
901449 |
if (err < 0)
|
|
Takashi Iwai |
901449 |
goto error;
|
|
Takashi Iwai |
901449 |
err = copy_ctl_value_to_user(userdata, valuep, data, type, count);
|
|
Takashi Iwai |
901449 |
--
|
|
Takashi Iwai |
901449 |
2.35.3
|
|
Takashi Iwai |
901449 |
|