Stefan Dirsch
fec607fe57
* Correct bounds checking in XkbSetNames() [CVE-2020-14345 / ZDI 11428, boo#1174635] - U_0002-Fix-XIChangeHierarchy-integer-underflow.patch * Fix XIChangeHierarchy() integer underflow [CVE-2020-14346 / ZDI-CAN-11429, boo#1174638] - U_0003-Fix-XkbSelectEvents-integer-underflow.patch * Fix XkbSelectEvents() integer underflow [CVE-2020-14361 / ZDI-CAN 11573, boo#1174910] - U_0004-Fix-XRecordRegisterClients-Integer-underflow.patch * Fix XRecordRegisterClients() Integer underflow [CVE-2020-14362 / ZDI-CAN-11574, boo#1174913] OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=773
32 lines
994 B
Diff
32 lines
994 B
Diff
From c940cc8b6c0a2983c1ec974f1b3f019795dd4cff Mon Sep 17 00:00:00 2001
|
|
From: Matthieu Herrb <matthieu@herrb.eu>
|
|
Date: Tue, 18 Aug 2020 14:49:04 +0200
|
|
Subject: [PATCH 2/4] Fix XIChangeHierarchy() integer underflow
|
|
|
|
CVE-2020-14346 / ZDI-CAN-11429
|
|
|
|
This vulnerability was discovered by:
|
|
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
|
|
|
|
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
|
|
---
|
|
Xi/xichangehierarchy.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
|
|
index cbdd91258..504defe56 100644
|
|
--- a/Xi/xichangehierarchy.c
|
|
+++ b/Xi/xichangehierarchy.c
|
|
@@ -423,7 +423,7 @@ ProcXIChangeHierarchy(ClientPtr client)
|
|
if (!stuff->num_changes)
|
|
return rc;
|
|
|
|
- len = ((size_t)stuff->length << 2) - sizeof(xXIChangeHierarchyReq);
|
|
+ len = ((size_t)client->req_len << 2) - sizeof(xXIChangeHierarchyReq);
|
|
|
|
any = (xXIAnyHierarchyChangeInfo *) &stuff[1];
|
|
while (stuff->num_changes--) {
|
|
--
|
|
2.16.4
|
|
|