mirror of
https://git.yoctoproject.org/poky
synced 2026-05-02 00:32:12 +02:00
d9f531b374
Fix below CVE's CVE-2023-6816 CVE-2024-0229 CVE-2024-21885 CVE-2024-21886 CVE-2024-0408 CVE-2024-0409 (From OE-Core rev: ad696a0067e11c332a4542ccacd76455f5fbd984) Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From 37539cb0bfe4ed96d4499bf371e6b1a474a740fe Mon Sep 17 00:00:00 2001
|
|
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Date: Thu, 21 Dec 2023 14:10:11 +1000
|
|
Subject: [PATCH] Xi: require a pointer and keyboard device for
|
|
XIAttachToMaster
|
|
|
|
If we remove a master device and specify which other master devices
|
|
attached slaves should be returned to, enforce that those two are
|
|
indeeed a pointer and a keyboard.
|
|
|
|
Otherwise we can try to attach the keyboards to pointers and vice versa,
|
|
leading to possible crashes later.
|
|
|
|
Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/37539cb0bfe4ed96d4499bf371e6b1a474a740fe]
|
|
CVE: CVE-2024-0229
|
|
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
|
|
---
|
|
Xi/xichangehierarchy.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
|
|
index 504defe566..d2d985848d 100644
|
|
--- a/Xi/xichangehierarchy.c
|
|
+++ b/Xi/xichangehierarchy.c
|
|
@@ -270,7 +270,7 @@ remove_master(ClientPtr client, xXIRemoveMasterInfo * r, int flags[MAXDEVICES])
|
|
if (rc != Success)
|
|
goto unwind;
|
|
|
|
- if (!IsMaster(newptr)) {
|
|
+ if (!IsMaster(newptr) || !IsPointerDevice(newptr)) {
|
|
client->errorValue = r->return_pointer;
|
|
rc = BadDevice;
|
|
goto unwind;
|
|
@@ -281,7 +281,7 @@ remove_master(ClientPtr client, xXIRemoveMasterInfo * r, int flags[MAXDEVICES])
|
|
if (rc != Success)
|
|
goto unwind;
|
|
|
|
- if (!IsMaster(newkeybd)) {
|
|
+ if (!IsMaster(newkeybd) || !IsKeyboardDevice(newkeybd)) {
|
|
client->errorValue = r->return_keyboard;
|
|
rc = BadDevice;
|
|
goto unwind;
|
|
--
|
|
GitLab
|
|
|