diff --git a/backport-0001-CVE-2023-5574.patch b/backport-0001-CVE-2023-5574.patch deleted file mode 100644 index a3631c4..0000000 --- a/backport-0001-CVE-2023-5574.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 1953f460b9ad1a9cdf0fcce70f6ad3310b713d5f Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 12 Oct 2023 12:44:13 +1000 -Subject: [PATCH] fb: properly wrap/unwrap CloseScreen - -fbCloseScreen assumes that it overrides miCloseScreen (which just -calls FreePixmap(screen->devPrivates)) and emulates that instead of -wrapping it. - -This is a wrong assumption, we may have ShmCloseScreen in the mix too, -resulting in leaks (see below). Fix this by properly setting up the -CloseScreen wrapper. - -This means we no longer need the manual DestroyPixmap call in -vfbCloseScreen, reverting d348ab06aae21c153ecbc3511aeafc8ab66d8303 - -CVE-2023-5574, ZDI-CAN-21213 - -This vulnerability was discovered by: -Sri working with Trend Micro Zero Day Initiative - -Signed-off-by: Peter Hutterer -Reviewed-by: Adam Jackson ---- - fb/fb.h | 1 + - fb/fbscreen.c | 14 ++++++++++---- - hw/vfb/InitOutput.c | 7 ------- - 3 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/fb/fb.h b/fb/fb.h -index d157b6956d..cd7bd05d21 100644 ---- a/fb/fb.h -+++ b/fb/fb.h -@@ -410,6 +410,7 @@ typedef struct { - #endif - DevPrivateKeyRec gcPrivateKeyRec; - DevPrivateKeyRec winPrivateKeyRec; -+ CloseScreenProcPtr CloseScreen; - } FbScreenPrivRec, *FbScreenPrivPtr; - - #define fbGetScreenPrivate(pScreen) ((FbScreenPrivPtr) \ -diff --git a/fb/fbscreen.c b/fb/fbscreen.c -index 4ab807ab50..c481033f98 100644 ---- a/fb/fbscreen.c -+++ b/fb/fbscreen.c -@@ -29,6 +29,7 @@ - Bool - fbCloseScreen(ScreenPtr pScreen) - { -+ FbScreenPrivPtr screen_priv = fbGetScreenPrivate(pScreen); - int d; - DepthPtr depths = pScreen->allowedDepths; - -@@ -37,9 +38,10 @@ fbCloseScreen(ScreenPtr pScreen) - free(depths[d].vids); - free(depths); - free(pScreen->visuals); -- if (pScreen->devPrivate) -- FreePixmap((PixmapPtr)pScreen->devPrivate); -- return TRUE; -+ -+ pScreen->CloseScreen = screen_priv->CloseScreen; -+ -+ return pScreen->CloseScreen(pScreen); - } - - Bool -@@ -144,6 +146,7 @@ fbFinishScreenInit(ScreenPtr pScreen, void *pbits, int xsize, int ysize, - int dpix, int dpiy, int width, int bpp) - #endif - { -+ FbScreenPrivPtr screen_priv; - VisualPtr visuals; - DepthPtr depths; - int nvisuals; -@@ -177,8 +180,11 @@ fbFinishScreenInit(ScreenPtr pScreen, void *pbits, int xsize, int ysize, - rootdepth, ndepths, depths, - defaultVisual, nvisuals, visuals)) - return FALSE; -- /* overwrite miCloseScreen with our own */ -+ -+ screen_priv = fbGetScreenPrivate(pScreen); -+ screen_priv->CloseScreen = pScreen->CloseScreen; - pScreen->CloseScreen = fbCloseScreen; -+ - return TRUE; - } - -diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c -index 48efb61b2f..076fb7defa 100644 ---- a/hw/vfb/InitOutput.c -+++ b/hw/vfb/InitOutput.c -@@ -720,13 +720,6 @@ vfbCloseScreen(ScreenPtr pScreen) - - pScreen->CloseScreen = pvfb->closeScreen; - -- /* -- * fb overwrites miCloseScreen, so do this here -- */ -- if (pScreen->devPrivate) -- (*pScreen->DestroyPixmap) (pScreen->devPrivate); -- pScreen->devPrivate = NULL; -- - return pScreen->CloseScreen(pScreen); - } - --- -GitLab - diff --git a/backport-0002-CVE-2023-5574.patch b/backport-0002-CVE-2023-5574.patch deleted file mode 100644 index 50ed818..0000000 --- a/backport-0002-CVE-2023-5574.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b6fe3f924aecac6d6e311673511ce61aa2f7a81f Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 12 Oct 2023 12:42:06 +1000 -Subject: [PATCH] mi: fix CloseScreen initialization order - -If SHM is enabled it will set the CloseScreen pointer, only to be -overridden by the hardcoded miCloseScreen pointer. Do this the other way -round, miCloseScreen is the bottom of our stack. - -Direct leak of 48 byte(s) in 2 object(s) allocated from: - #0 0x7f5ea3ad8cc7 in calloc (/lib64/libasan.so.8+0xd8cc7) (BuildId: d8f3addefe29e892d775c30eb364afd3c2484ca5)) - #1 0x70adfb in ShmInitScreenPriv ../Xext/shm.c:213 - -Signed-off-by: Peter Hutterer -Reviewed-by: Adam Jackson - ---- - mi/miscrinit.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mi/miscrinit.c b/mi/miscrinit.c -index 264622d..907e46a 100644 ---- a/mi/miscrinit.c -+++ b/mi/miscrinit.c -@@ -242,10 +242,10 @@ miScreenInit(ScreenPtr pScreen, void *pbits, /* pointer to screen bits */ - pScreen->numVisuals = numVisuals; - pScreen->visuals = visuals; - if (width) { -+ pScreen->CloseScreen = miCloseScreen; - #ifdef MITSHM - ShmRegisterFbFuncs(pScreen); - #endif -- pScreen->CloseScreen = miCloseScreen; - } - /* else CloseScreen */ - /* QueryBestSize, SaveScreen, GetImage, GetSpans */ --- -2.27.0 - diff --git a/backport-0003-CVE-2023-5574.patch b/backport-0003-CVE-2023-5574.patch deleted file mode 100644 index 5b2fa9a..0000000 --- a/backport-0003-CVE-2023-5574.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ab2c58ba4719fc31c19c7829b06bdba8a88bd586 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 24 Oct 2023 12:09:36 +1000 -Subject: [PATCH] dix: always initialize pScreen->CloseScreen - -CloseScreen is wrapped by the various modules, many of which do not -check if they're the last ones unwrapping. This is fine if the order of -those modules never changes but when it does we might get a NULL-pointer -dereference by some naive code doing a - - pScreen->CloseScreen = priv->CloseScreen; - free(priv); - return (*pScreen->CloseScreen)(pScreen); - -To avoid this set it to a default function that just returns TRUE that's -guaranteed to be the last one. ---- - dix/dispatch.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/dix/dispatch.c b/dix/dispatch.c -index eaac39b7c9..cd092fd409 100644 ---- a/dix/dispatch.c -+++ b/dix/dispatch.c -@@ -3890,6 +3890,12 @@ static int indexForScanlinePad[65] = { - 3 /* 64 bits per scanline pad unit */ - }; - -+static Bool -+DefaultCloseScreen(ScreenPtr screen) -+{ -+ return TRUE; -+} -+ - /* - grow the array of screenRecs if necessary. - call the device-supplied initialization procedure -@@ -3949,6 +3955,9 @@ static int init_screen(ScreenPtr pScreen, int i, Bool gpu) - PixmapWidthPaddingInfo[depth].notPower2 = 0; - } - } -+ -+ pScreen->CloseScreen = DefaultCloseScreen; -+ - return 0; - } - --- -GitLab - diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index aeba449..160a2b4 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -16,7 +16,7 @@ Name: xorg-x11-server Version: 1.20.11 -Release: 22 +Release: 23 Summary: X.Org X11 X server License: MIT and GPLv2 URL: https://www.x.org @@ -109,9 +109,6 @@ Patch6021: backport-CVE-2022-3550.patch Patch6022: render-fix-build-with-gcc12.patch Patch6023: backport-CVE-2023-5367.patch Patch6024: backport-CVE-2023-5380.patch -Patch6025: backport-0001-CVE-2023-5574.patch -Patch6026: backport-0002-CVE-2023-5574.patch -Patch6027: backport-0003-CVE-2023-5574.patch BuildRequires: audit-libs-devel autoconf automake bison dbus-devel flex git gcc BuildRequires: systemtap-sdt-devel libtool pkgconfig @@ -453,6 +450,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %{_mandir}/man*/* %changelog +* Tue Nov 07 2023 zhouwenpei -1.20.11-23 +- Rollback CVE-2023-5574 patch + * Thu Oct 26 2023 zhouwenpei -1.20.11-22 - fix CVE-2023-5367,CVE-2023-5380,CVE-2023-5574