From 3e8f9229c54c8c0cd5ffa6273c486cf56cd10af3 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 20 2022 10:16:14 +0000
Subject: import xorg-x11-server-Xwayland-21.1.3-9.el8


---

diff --git a/SOURCES/0008-Xext-fix-invalid-event-type-mask-in-XTestSwapFakeInp.patch b/SOURCES/0008-Xext-fix-invalid-event-type-mask-in-XTestSwapFakeInp.patch
new file mode 100644
index 0000000..c84d387
--- /dev/null
+++ b/SOURCES/0008-Xext-fix-invalid-event-type-mask-in-XTestSwapFakeInp.patch
@@ -0,0 +1,35 @@
+From bb1711b7fba42f2a0c7d1c09beee241a1b2bcc30 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon, 19 Dec 2022 10:06:45 +1000
+Subject: [PATCH xserver] Xext: fix invalid event type mask in
+ XTestSwapFakeInput
+
+In commit b320ca0 the mask was inadvertently changed from octal 0177 to
+hexadecimal 0x177.
+
+Fixes commit b320ca0ffe4c0c872eeb3a93d9bde21f765c7c63
+  Xtest: disallow GenericEvents in XTestSwapFakeInput
+
+Found by Stuart Cassoff
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ Xext/xtest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Xext/xtest.c b/Xext/xtest.c
+index 2985a4ce6e..dde5c4cf9d 100644
+--- a/Xext/xtest.c
++++ b/Xext/xtest.c
+@@ -502,7 +502,7 @@ XTestSwapFakeInput(ClientPtr client, xReq * req)
+ 
+     nev = ((req->length << 2) - sizeof(xReq)) / sizeof(xEvent);
+     for (ev = (xEvent *) &req[1]; --nev >= 0; ev++) {
+-        int evtype = ev->u.u.type & 0x177;
++        int evtype = ev->u.u.type & 0177;
+         /* Swap event */
+         proc = EventSwapVector[evtype];
+         /* no swapping proc; invalid event type? */
+-- 
+2.38.1
+
diff --git a/SPECS/xorg-x11-server-Xwayland.spec b/SPECS/xorg-x11-server-Xwayland.spec
index d015d9a..b2d87ad 100644
--- a/SPECS/xorg-x11-server-Xwayland.spec
+++ b/SPECS/xorg-x11-server-Xwayland.spec
@@ -9,7 +9,7 @@
 Summary:   Xwayland
 Name:      xorg-x11-server-Xwayland
 Version:   21.1.3
-Release:   8%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
+Release:   9%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
 
 URL:       http://www.x.org
 %if 0%{?gitdate}
@@ -51,8 +51,10 @@ Patch10021: 0004-Xi-disallow-passive-grabs-with-a-detail-255.patch
 Patch10022: 0005-Xext-free-the-screen-saver-resource-when-replacing-i.patch
 # CVE-2022-46342
 Patch10023: 0006-Xext-free-the-XvRTVideoNotify-when-turning-off-from-.patch
-# CVE-2022-46283
+# CVE-2022-4283
 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
 
 License:   MIT
 
@@ -160,6 +162,9 @@ rm -Rf $RPM_BUILD_ROOT%{_localstatedir}/lib/xkb
 %{_libdir}/pkgconfig/xwayland.pc
 
 %changelog
+* Mon Dec 19 2022 Peter Hutterer <peter.hutterer@redhat.com> - 21.1.3-9
+- Follow-up fix for CVE-2022-46340 (#2151777)
+
 * Tue Dec 13 2022 Peter Hutterer <peter.hutterer@redhat.com> - 21.1.3-8
 - CVE fix for: CVE-2022-4283 (#2151802), CVE-2022-46340 (#2151777),
   CVE-2022-46341 (#2151782), CVE-2022-46342 (#2151785),