diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14346.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14346.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14346.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14346.patch deleted file mode 100644 index 4994a21d33..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14346.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From c940cc8b6c0a2983c1ec974f1b3f019795dd4cff Mon Sep 17 00:00:00 2001 | ||
2 | From: Matthieu Herrb <matthieu@herrb.eu> | ||
3 | Date: Tue, 18 Aug 2020 14:49:04 +0200 | ||
4 | Subject: [PATCH] Fix XIChangeHierarchy() integer underflow | ||
5 | |||
6 | CVE-2020-14346 / ZDI-CAN-11429 | ||
7 | |||
8 | This vulnerability was discovered by: | ||
9 | Jan-Niklas Sohn working with Trend Micro Zero Day Initiative | ||
10 | |||
11 | Signed-off-by: Matthieu Herrb <matthieu@herrb.eu> | ||
12 | |||
13 | Upstream-Status: Backport | ||
14 | [https://gitlab.freedesktop.org/xorg/xserver/-/commit/c940cc8b6c0a2983c1ec974f1b3f019795dd4cff] | ||
15 | CVE: CVE-2020-14346 | ||
16 | Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> | ||
17 | --- | ||
18 | Xi/xichangehierarchy.c | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c | ||
22 | index cbdd91258..504defe56 100644 | ||
23 | --- a/Xi/xichangehierarchy.c | ||
24 | +++ b/Xi/xichangehierarchy.c | ||
25 | @@ -423,7 +423,7 @@ ProcXIChangeHierarchy(ClientPtr client) | ||
26 | if (!stuff->num_changes) | ||
27 | return rc; | ||
28 | |||
29 | - len = ((size_t)stuff->length << 2) - sizeof(xXIChangeHierarchyReq); | ||
30 | + len = ((size_t)client->req_len << 2) - sizeof(xXIChangeHierarchyReq); | ||
31 | |||
32 | any = (xXIAnyHierarchyChangeInfo *) &stuff[1]; | ||
33 | while (stuff->num_changes--) { | ||
34 | -- | ||
35 | 2.17.1 | ||
36 | |||