diff --git a/0001-fix-CVE-2023-6478.patch b/0001-fix-CVE-2023-6478.patch new file mode 100644 index 0000000000000000000000000000000000000000..4e93ed1d601122592c88cb1452801a7597a090de --- /dev/null +++ b/0001-fix-CVE-2023-6478.patch @@ -0,0 +1,39 @@ +From a4debd37a19776d883421516cc9f1a0f6ff7140b Mon Sep 17 00:00:00 2001 +From: zhangxingrong +Date: Thu, 1 Feb 2024 14:27:27 +0800 +Subject: [PATCH] fix-CVE-2023-6478 + +--- + randr/rrproperty.c | 2 +- + randr/rrproviderproperty.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/randr/rrproperty.c b/randr/rrproperty.c +index c2fb958..1fb89e6 100644 +--- a/randr/rrproperty.c ++++ b/randr/rrproperty.c +@@ -530,7 +530,7 @@ ProcRRChangeOutputProperty(ClientPtr client) + char format, mode; + unsigned long len; + int sizeInBytes; +- int totalSize; ++ uint64_t totalSize; + int err; + + REQUEST_AT_LEAST_SIZE(xRRChangeOutputPropertyReq); +diff --git a/randr/rrproviderproperty.c b/randr/rrproviderproperty.c +index b79c17f..90c5a9a 100644 +--- a/randr/rrproviderproperty.c ++++ b/randr/rrproviderproperty.c +@@ -498,7 +498,7 @@ ProcRRChangeProviderProperty(ClientPtr client) + char format, mode; + unsigned long len; + int sizeInBytes; +- int totalSize; ++ uint64_t totalSize; + int err; + + REQUEST_AT_LEAST_SIZE(xRRChangeProviderPropertyReq); +-- +2.33.0 + diff --git a/xorg-x11-server-xwayland.spec b/xorg-x11-server-xwayland.spec index 3715c046df7735dc69ea689a4897926094082ccb..098f4d8a4ed0d420913e7eb9c02d557ce52f2a5b 100644 --- a/xorg-x11-server-xwayland.spec +++ b/xorg-x11-server-xwayland.spec @@ -4,7 +4,7 @@ Summary: Xwayland Name: xorg-x11-server-Xwayland Version: 22.1.2 -Release: 2 +Release: 3 License: MIT URL: http://www.x.org Source0: https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.xz @@ -65,6 +65,8 @@ BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xcb-renderutil) +Patch01: 0001-fix-CVE-2023-6478.patch + %description Xwayland is an X server for running X clients under Wayland. @@ -77,7 +79,7 @@ The development package provides the developmental files which are necessary for developing Wayland compositors using Xwayland. %prep -%autosetup -n %{pkgname}-%{version} +%autosetup -n %{pkgname}-%{version} -p1 %build %meson \ @@ -109,6 +111,9 @@ rm -Rf $RPM_BUILD_ROOT%{_localstatedir}/lib/xkb %{_libdir}/pkgconfig/xwayland.pc %changelog +* Thu Feb 1 2024 zhangxingrong - 22.1.2-3 +- fix cve:CVE-2023-6478 + * Fri Jun 24 2022 wangkerong - 22.1.2-2 - rename packagename