|
 |
4be359 |
From 120548cde1d7642ff79d71827993e32babfb4e2f Mon Sep 17 00:00:00 2001
|
|
|
4be359 |
From: Ryan Sullivan <rysulliv@redhat.com>
|
|
|
4be359 |
Date: Fri, 17 Feb 2023 12:26:57 -0500
|
|
|
4be359 |
Subject: [KPATCH CVE-2023-0266] kpatch fixes for CVE-2023-0266
|
|
|
4be359 |
|
|
|
4be359 |
Kernels:
|
|
|
4be359 |
5.14.0-162.6.1.el9_1
|
|
|
4be359 |
5.14.0-162.12.1.el9_1
|
|
|
4be359 |
|
|
|
4be359 |
|
|
|
4be359 |
Kpatch-MR: https://gitlab.com/redhat/prdsc/rhel/src/kpatch/rhel-9/-/merge_requests/24
|
|
|
4be359 |
Approved-by: Yannick Cote (@ycote1)
|
|
|
4be359 |
Approved-by: Joe Lawrence (@joe.lawrence)
|
|
|
4be359 |
Changes since last build:
|
|
|
4be359 |
[x86_64]:
|
|
|
4be359 |
control.o: changed function: snd_ctl_elem_read
|
|
|
4be359 |
control.o: changed function: snd_ctl_ioctl
|
|
|
4be359 |
dev.o: changed function: register_netdevice
|
|
|
4be359 |
tun.o: changed function: tun_free_netdev
|
|
|
4be359 |
tun.o: changed function: tun_set_iff.constprop.0
|
|
|
4be359 |
tun.o: new function: kpp_cve_2022_4744_tun_net_init
|
|
|
4be359 |
|
|
|
4be359 |
[ppc64le]:
|
|
|
4be359 |
dev.o: changed function: register_netdevice
|
|
|
4be359 |
tun.o: changed function: tun_free_netdev
|
|
|
4be359 |
tun.o: changed function: tun_set_iff.constprop.0
|
|
|
4be359 |
tun.o: new function: kpp_cve_2022_4744_tun_net_init
|
|
|
4be359 |
|
|
|
4be359 |
---------------------------
|
|
|
4be359 |
|
|
|
4be359 |
Modifications: none
|
|
|
4be359 |
|
|
|
4be359 |
commit c0295d3bd6b49f47e30822a9de9c042020092424
|
|
|
4be359 |
Author: Jaroslav Kysela <jkysela@redhat.com>
|
|
|
4be359 |
Date: Tue Jan 31 17:13:11 2023 +0100
|
|
|
4be359 |
|
|
|
4be359 |
ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF
|
|
|
4be359 |
|
|
|
4be359 |
Takes rwsem lock inside snd_ctl_elem_read instead of snd_ctl_elem_read_user
|
|
|
4be359 |
like it was done for write in commit 1fa4445f9adf1 ("ALSA: control - introduce
|
|
|
4be359 |
snd_ctl_notify_one() helper"). Doing this way we are also fixing the following
|
|
|
4be359 |
locking issue happening in the compat path which can be easily triggered and
|
|
|
4be359 |
turned into an use-after-free.
|
|
|
4be359 |
|
|
|
4be359 |
64-bits:
|
|
|
4be359 |
snd_ctl_ioctl
|
|
|
4be359 |
snd_ctl_elem_read_user
|
|
|
4be359 |
[takes controls_rwsem]
|
|
|
4be359 |
snd_ctl_elem_read [lock properly held, all good]
|
|
|
4be359 |
[drops controls_rwsem]
|
|
|
4be359 |
|
|
|
4be359 |
32-bits:
|
|
|
4be359 |
snd_ctl_ioctl_compat
|
|
|
4be359 |
snd_ctl_elem_write_read_compat
|
|
|
4be359 |
ctl_elem_write_read
|
|
|
4be359 |
snd_ctl_elem_read [missing lock, not good]
|
|
|
4be359 |
|
|
|
4be359 |
CVE-2023-0266 was assigned for this issue.
|
|
|
4be359 |
|
|
|
4be359 |
Cc: stable@kernel.org # 5.13+
|
|
|
4be359 |
Signed-off-by: Clement Lecigne <clecigne@google.com>
|
|
|
4be359 |
Reviewed-by: Jaroslav Kysela <perex@perex.cz>
|
|
|
4be359 |
Link: https://lore.kernel.org/r/20230113120745.25464-1-tiwai@suse.de
|
|
|
4be359 |
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
|
4be359 |
|
|
|
4be359 |
Author: Clement Lecigne <clecigne@google.com>
|
|
|
4be359 |
Date: Fri Jan 13 13:07:45 2023 +0100
|
|
|
4be359 |
|
|
|
4be359 |
CVE: CVE-2023-0266
|
|
|
4be359 |
|
|
|
4be359 |
Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
|
|
|
4be359 |
(cherry picked from commit 56b88b50565cd8b946a2d00b0c83927b7ebb055e)
|
|
|
4be359 |
Bugzilla: https://bugzilla.redhat.com/2163390
|
|
|
4be359 |
|
|
|
4be359 |
Signed-off-by: Ryan Sullivan <rysulliv@redhat.com>
|
|
|
4be359 |
---
|
|
|
4be359 |
sound/core/control.c | 24 +++++++++++++++---------
|
|
|
4be359 |
1 file changed, 15 insertions(+), 9 deletions(-)
|
|
|
4be359 |
|
|
|
4be359 |
diff --git a/sound/core/control.c b/sound/core/control.c
|
|
|
4be359 |
index a25c0d64d104..6e2a1e424627 100644
|
|
|
4be359 |
--- a/sound/core/control.c
|
|
|
4be359 |
+++ b/sound/core/control.c
|
|
|
4be359 |
@@ -1066,14 +1066,19 @@ static int snd_ctl_elem_read(struct snd_card *card,
|
|
|
4be359 |
const u32 pattern = 0xdeadbeef;
|
|
|
4be359 |
int ret;
|
|
|
4be359 |
|
|
|
4be359 |
+ down_read(&card->controls_rwsem);
|
|
|
4be359 |
kctl = snd_ctl_find_id(card, &control->id);
|
|
|
4be359 |
- if (kctl == NULL)
|
|
|
4be359 |
- return -ENOENT;
|
|
|
4be359 |
+ if (kctl == NULL) {
|
|
|
4be359 |
+ ret = -ENOENT;
|
|
|
4be359 |
+ goto unlock;
|
|
|
4be359 |
+ }
|
|
|
4be359 |
|
|
|
4be359 |
index_offset = snd_ctl_get_ioff(kctl, &control->id);
|
|
|
4be359 |
vd = &kctl->vd[index_offset];
|
|
|
4be359 |
- if (!(vd->access & SNDRV_CTL_ELEM_ACCESS_READ) || kctl->get == NULL)
|
|
|
4be359 |
- return -EPERM;
|
|
|
4be359 |
+ if (!(vd->access & SNDRV_CTL_ELEM_ACCESS_READ) || kctl->get == NULL) {
|
|
|
4be359 |
+ ret = -EPERM;
|
|
|
4be359 |
+ goto unlock;
|
|
|
4be359 |
+ }
|
|
|
4be359 |
|
|
|
4be359 |
snd_ctl_build_ioff(&control->id, kctl, index_offset);
|
|
|
4be359 |
|
|
|
4be359 |
@@ -1083,7 +1088,7 @@ static int snd_ctl_elem_read(struct snd_card *card,
|
|
|
4be359 |
info.id = control->id;
|
|
|
4be359 |
ret = __snd_ctl_elem_info(card, kctl, &info, NULL);
|
|
|
4be359 |
if (ret < 0)
|
|
|
4be359 |
- return ret;
|
|
|
4be359 |
+ goto unlock;
|
|
|
4be359 |
#endif
|
|
|
4be359 |
|
|
|
4be359 |
if (!snd_ctl_skip_validation(&info))
|
|
|
4be359 |
@@ -1093,7 +1098,7 @@ static int snd_ctl_elem_read(struct snd_card *card,
|
|
|
4be359 |
ret = kctl->get(kctl, control);
|
|
|
4be359 |
snd_power_unref(card);
|
|
|
4be359 |
if (ret < 0)
|
|
|
4be359 |
- return ret;
|
|
|
4be359 |
+ goto unlock;
|
|
|
4be359 |
if (!snd_ctl_skip_validation(&info) &&
|
|
|
4be359 |
sanity_check_elem_value(card, control, &info, pattern) < 0) {
|
|
|
4be359 |
dev_err(card->dev,
|
|
|
4be359 |
@@ -1101,8 +1106,11 @@ static int snd_ctl_elem_read(struct snd_card *card,
|
|
|
4be359 |
control->id.iface, control->id.device,
|
|
|
4be359 |
control->id.subdevice, control->id.name,
|
|
|
4be359 |
control->id.index);
|
|
|
4be359 |
- return -EINVAL;
|
|
|
4be359 |
+ ret = -EINVAL;
|
|
|
4be359 |
+ goto unlock;
|
|
|
4be359 |
}
|
|
|
4be359 |
+unlock:
|
|
|
4be359 |
+ up_read(&card->controls_rwsem);
|
|
|
4be359 |
return ret;
|
|
|
4be359 |
}
|
|
|
4be359 |
|
|
|
4be359 |
@@ -1116,9 +1124,7 @@ static int snd_ctl_elem_read_user(struct snd_card *card,
|
|
|
4be359 |
if (IS_ERR(control))
|
|
|
4be359 |
return PTR_ERR(control);
|
|
|
4be359 |
|
|
|
4be359 |
- down_read(&card->controls_rwsem);
|
|
|
4be359 |
result = snd_ctl_elem_read(card, control);
|
|
|
4be359 |
- up_read(&card->controls_rwsem);
|
|
|
4be359 |
if (result < 0)
|
|
|
4be359 |
goto error;
|
|
|
4be359 |
|
|
|
4be359 |
--
|
|
|
4be359 |
2.39.2
|
|
|
4be359 |
|
|
|
4be359 |
|