From 76927f44856a72af2061b112decc13b2e04b2637 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 19 Dec 2022 15:20:34 +1000 Subject: [PATCH] Follow-up fix for CVE-2022-46340 (#2151778) Resolves: rhbz#2151778 --- ...-event-type-mask-in-XTestSwapFakeInp.patch | 35 +++++++++++++++++++ xorg-x11-server-Xwayland.spec | 7 +++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0008-Xext-fix-invalid-event-type-mask-in-XTestSwapFakeInp.patch diff --git a/0008-Xext-fix-invalid-event-type-mask-in-XTestSwapFakeInp.patch b/0008-Xext-fix-invalid-event-type-mask-in-XTestSwapFakeInp.patch new file mode 100644 index 0000000..c84d387 --- /dev/null +++ b/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 +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 +--- + 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/xorg-x11-server-Xwayland.spec b/xorg-x11-server-Xwayland.spec index ca808c1..763e807 100644 --- a/xorg-x11-server-Xwayland.spec +++ b/xorg-x11-server-Xwayland.spec @@ -9,7 +9,7 @@ Summary: Xwayland Name: xorg-x11-server-Xwayland Version: 21.1.3 -Release: 5%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist} +Release: 6%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist} URL: http://www.x.org %if 0%{?gitdate} @@ -53,6 +53,8 @@ Patch10014: 0005-Xext-free-the-screen-saver-resource-when-replacing-i.patch Patch10015: 0006-Xext-free-the-XvRTVideoNotify-when-turning-off-from-.patch # CVE-2022-46283 Patch10016: 0007-xkb-reset-the-radio_groups-pointer-to-NULL-after-fre.patch +# Follow-up to CVE-2022-46340 +Patch10017: 0008-Xext-fix-invalid-event-type-mask-in-XTestSwapFakeInp.patch License: MIT @@ -159,6 +161,9 @@ rm -Rf $RPM_BUILD_ROOT%{_localstatedir}/lib/xkb %{_libdir}/pkgconfig/xwayland.pc %changelog +* Mon Dec 19 2022 Peter Hutterer - 21.1.3-6 +- Follow-up fix for CVE-2022-46340 (#2151778) + * Wed Dec 14 2022 Peter Hutterer - 21.1.3-5 - CVE fix for: CVE-2022-4283 (#2151803), CVE-2022-46340 (#2151778), CVE-2022-46341 (#2151783), CVE-2022-46342 (#2151786),