diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14361.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14361.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14361.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14361.patch deleted file mode 100644 index 710cc3873c..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14361.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 144849ea27230962227e62a943b399e2ab304787 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matthieu Herrb <matthieu@herrb.eu> | ||
3 | Date: Tue, 18 Aug 2020 14:52:29 +0200 | ||
4 | Subject: [PATCH] Fix XkbSelectEvents() integer underflow | ||
5 | |||
6 | CVE-2020-14361 ZDI-CAN 11573 | ||
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/144849ea27230962227e62a943b399e2ab304787] | ||
15 | CVE: CVE-2020-14361 | ||
16 | Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> | ||
17 | --- | ||
18 | xkb/xkbSwap.c | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c | ||
22 | index 1c1ed5ff4..50cabb90e 100644 | ||
23 | --- a/xkb/xkbSwap.c | ||
24 | +++ b/xkb/xkbSwap.c | ||
25 | @@ -76,7 +76,7 @@ SProcXkbSelectEvents(ClientPtr client) | ||
26 | register unsigned bit, ndx, maskLeft, dataLeft, size; | ||
27 | |||
28 | from.c8 = (CARD8 *) &stuff[1]; | ||
29 | - dataLeft = (stuff->length * 4) - SIZEOF(xkbSelectEventsReq); | ||
30 | + dataLeft = (client->req_len * 4) - SIZEOF(xkbSelectEventsReq); | ||
31 | maskLeft = (stuff->affectWhich & (~XkbMapNotifyMask)); | ||
32 | for (ndx = 0, bit = 1; (maskLeft != 0); ndx++, bit <<= 1) { | ||
33 | if (((bit & maskLeft) == 0) || (ndx == XkbMapNotify)) | ||
34 | -- | ||
35 | 2.17.1 | ||
36 | |||