forked from pool/xorg-x11-server
Stefan Dirsch
37722e6dc6
* XkbGetKbdByName use-after-free (ZDI-CAN-19530, CVE-2022-4283,
bsc#1206017)
- U_0001-Xtest-disallow-GenericEvents-in-XTestSwapFakeInput.patch
* Server XTestSwapFakeInput stack overflow (ZDI-CAN 19265,
CVE-2022-46340, bsc#1205874)
- U_0002-Xi-return-an-error-from-XI-property-changes-if-verif.patch
* Xi: return an error from XI property changes if verification
failed (no ZDI-CAN id, no CVE id, bsc#1205875)
- U_0003-Xi-avoid-integer-truncation-in-length-check-of-ProcX.patch
* Server XIChangeProperty out-of-bounds access (ZDI-CAN 19405,
CVE-2022-46344, bsc#1205876)
- U_0004-Xi-disallow-passive-grabs-with-a-detail-255.patch
* Server XIPassiveUngrabDevice out-of-bounds access (ZDI-CAN 19381,
CVE-2022-46341, bsc#1205877)
- U_0005-Xext-free-the-screen-saver-resource-when-replacing-i.patch
* Server ScreenSaverSetAttributes use-after-free (ZDI-CAN 19404,
CVE-2022-46343, bsc#1205878)
- U_0006-Xext-free-the-XvRTVideoNotify-when-turning-off-from-.patch
* Server XvdiSelectVideoNotify use-after-free (ZDI-CAN 19400,
CVE-2022-46342, bsc#1205879)
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=843
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From bee46f23fbc2b2722753c3b7769c990b90c235a0 Mon Sep 17 00:00:00 2001
|
|
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Date: Tue, 29 Nov 2022 13:24:00 +1000
|
|
Subject: [PATCH xserver 2/6] Xi: return an error from XI property changes if
|
|
verification failed
|
|
|
|
Both ProcXChangeDeviceProperty and ProcXIChangeProperty checked the
|
|
property for validity but didn't actually return the potential error.
|
|
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
---
|
|
Xi/xiproperty.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
|
|
index a36f7d61df..68c362c628 100644
|
|
--- a/Xi/xiproperty.c
|
|
+++ b/Xi/xiproperty.c
|
|
@@ -902,6 +902,8 @@ ProcXChangeDeviceProperty(ClientPtr client)
|
|
|
|
rc = check_change_property(client, stuff->property, stuff->type,
|
|
stuff->format, stuff->mode, stuff->nUnits);
|
|
+ if (rc != Success)
|
|
+ return rc;
|
|
|
|
len = stuff->nUnits;
|
|
if (len > (bytes_to_int32(0xffffffff - sizeof(xChangeDevicePropertyReq))))
|
|
@@ -1141,6 +1143,9 @@ ProcXIChangeProperty(ClientPtr client)
|
|
|
|
rc = check_change_property(client, stuff->property, stuff->type,
|
|
stuff->format, stuff->mode, stuff->num_items);
|
|
+ if (rc != Success)
|
|
+ return rc;
|
|
+
|
|
len = stuff->num_items;
|
|
if (len > bytes_to_int32(0xffffffff - sizeof(xXIChangePropertyReq)))
|
|
return BadLength;
|
|
--
|
|
2.38.1
|
|
|