From ca63c12e256bfcda9bf40ecc775c69b5f042f37b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Feb 08 2023 19:39:53 +0000
Subject: import xorg-x11-server-1.20.4-22.el7_9


---

diff --git a/SOURCES/0001-Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch b/SOURCES/0001-Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch
new file mode 100644
index 0000000..2389895
--- /dev/null
+++ b/SOURCES/0001-Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch
@@ -0,0 +1,35 @@
+From 7150ba655c0cc08fa6ded309b81265bb672f2869 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 25 Jan 2023 11:41:40 +1000
+Subject: [PATCH xserver] Xi: fix potential use-after-free in
+ DeepCopyPointerClasses
+
+CVE-2023-0494, ZDI-CAN 19596
+
+This vulnerability was discovered by:
+Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ Xi/exevents.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Xi/exevents.c b/Xi/exevents.c
+index 217baa9561..dcd4efb3bc 100644
+--- a/Xi/exevents.c
++++ b/Xi/exevents.c
+@@ -619,8 +619,10 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
+             memcpy(to->button->xkb_acts, from->button->xkb_acts,
+                    sizeof(XkbAction));
+         }
+-        else
++        else {
+             free(to->button->xkb_acts);
++            to->button->xkb_acts = NULL;
++        }
+ 
+         memcpy(to->button->labels, from->button->labels,
+                from->button->numButtons * sizeof(Atom));
+-- 
+2.39.0
+
diff --git a/SPECS/xorg-x11-server.spec b/SPECS/xorg-x11-server.spec
index 81343e9..e07b924 100644
--- a/SPECS/xorg-x11-server.spec
+++ b/SPECS/xorg-x11-server.spec
@@ -42,7 +42,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.20.4
-Release:   21%{?gitdate:.%{gitdate}}%{?dist}
+Release:   22%{?gitdate:.%{gitdate}}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -184,6 +184,8 @@ Patch10023: 0006-Xext-free-the-XvRTVideoNotify-when-turning-off-from-.patch
 Patch10024: 0007-xkb-reset-the-radio_groups-pointer-to-NULL-after-fre.patch
 # Follow-up to CVE-2022-46340
 Patch10025: 0008-Xext-fix-invalid-event-type-mask-in-XTestSwapFakeInp.patch
+# CVE-2023-0494
+Patch10026: 0001-Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch
 
 %global moduledir	%{_libdir}/xorg/modules
 %global drimoduledir	%{_libdir}/dri
@@ -666,6 +668,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Feb 03 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.20.4-22
+- CVE fix for: CVE-2023-0494 (#2166513)
+
 * Mon Dec 19 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.20.4-21
 - Follow-up fix for CVE-2022-46340 (#2151775)