summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2023-5574-2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2023-5574-2.patch')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2023-5574-2.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2023-5574-2.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2023-5574-2.patch
deleted file mode 100644
index 2cdef752c7..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2023-5574-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From b6fe3f924aecac6d6e311673511ce61aa2f7a81f Mon Sep 17 00:00:00 2001
2From: Peter Hutterer <peter.hutterer@who-t.net>
3Date: Thu, 12 Oct 2023 12:42:06 +1000
4Subject: [PATCH] mi: fix CloseScreen initialization order
5
6If SHM is enabled it will set the CloseScreen pointer, only to be
7overridden by the hardcoded miCloseScreen pointer. Do this the other way
8round, miCloseScreen is the bottom of our stack.
9
10Direct leak of 48 byte(s) in 2 object(s) allocated from:
11 #0 0x7f5ea3ad8cc7 in calloc (/lib64/libasan.so.8+0xd8cc7) (BuildId: d8f3addefe29e892d775c30eb364afd3c2484ca5))
12 #1 0x70adfb in ShmInitScreenPriv ../Xext/shm.c:213
13
14Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
15Reviewed-by: Adam Jackson <ajax@redhat.com>
16
17Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/b6fe3f924aecac6d6e311673511ce61aa2f7a81f]
18CVE: CVE-2023-5574
19Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
20---
21 mi/miscrinit.c | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/mi/miscrinit.c b/mi/miscrinit.c
25index 3bb52b1bc6..b88938c9ae 100644
26--- a/mi/miscrinit.c
27+++ b/mi/miscrinit.c
28@@ -249,10 +249,10 @@ miScreenInit(ScreenPtr pScreen, void *pbits, /* pointer to screen bits */
29 pScreen->numVisuals = numVisuals;
30 pScreen->visuals = visuals;
31 if (width) {
32+ pScreen->CloseScreen = miCloseScreen;
33 #ifdef MITSHM
34 ShmRegisterFbFuncs(pScreen);
35 #endif
36- pScreen->CloseScreen = miCloseScreen;
37 }
38 /* else CloseScreen */
39 /* QueryBestSize */
40--
41GitLab
42