From 7fff7baf8ba334fc50fd72cdc805b0817796541f Mon Sep 17 00:00:00 2001 From: dashnfschina Date: Tue, 6 Aug 2024 23:15:17 -0400 Subject: [PATCH] fix CVE-2024-31083 --- ...1-server-Xwayland-fix-CVE-2024-31083.patch | 25 +++++++++++++++++++ xorg-x11-server-Xwayland.spec | 7 +++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 xorg-x11-server-Xwayland-fix-CVE-2024-31083.patch diff --git a/xorg-x11-server-Xwayland-fix-CVE-2024-31083.patch b/xorg-x11-server-Xwayland-fix-CVE-2024-31083.patch new file mode 100644 index 0000000..94642e2 --- /dev/null +++ b/xorg-x11-server-Xwayland-fix-CVE-2024-31083.patch @@ -0,0 +1,25 @@ +From 06c08867478a52666b651fd55daf48657193ba12 Mon Sep 17 00:00:00 2001 +From: dashnfschina +Date: Tue, 6 Aug 2024 23:10:54 -0400 +Subject: [PATCH] 2 + +--- + render/glyph.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/render/glyph.c b/render/glyph.c +index d5fc5f3..f5069d4 100644 +--- a/render/glyph.c ++++ b/render/glyph.c +@@ -291,8 +291,6 @@ AddGlyph(GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id) + gr = FindGlyphRef(&globalGlyphs[glyphSet->fdepth], signature, + TRUE, glyph->sha1); + if (gr->glyph && gr->glyph != DeletedGlyph && gr->glyph != glyph) { +- FreeGlyphPicture(glyph); +- dixFreeObjectWithPrivates(glyph, PRIVATE_GLYPH); + glyph = gr->glyph; + } + else if (gr->glyph != glyph) { +-- +2.18.2 + diff --git a/xorg-x11-server-Xwayland.spec b/xorg-x11-server-Xwayland.spec index b303a6a..6b995c7 100644 --- a/xorg-x11-server-Xwayland.spec +++ b/xorg-x11-server-Xwayland.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %global pkgname xwayland %global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins" @@ -11,6 +11,8 @@ Release: %{anolis_release}%{?dist} URL: http://www.x.org Source0: https://www.x.org/releases/individual/xserver/%{pkgname}-%{version}.tar.xz +Patch0: xorg-x11-server-Xwayland-fix-CVE-2024-31083.patch + License: MIT Requires: xkeyboard-config @@ -139,6 +141,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %doc README.md %changelog +* Fri May 10 2024 dash - 23.2.5-2 +- fix CVE-2024-31083 + * Fri May 10 2024 duanty - 23.2.5-1 - update to 23.2.5 -- Gitee