diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2022-3550.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2022-3550.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2022-3550.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2022-3550.patch new file mode 100644 index 0000000000..efec7b6b4e --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2022-3550.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From d2dcbdc67c96c84dff301505072b0b7b022f1a14 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Hutterer <peter.hutterer@who-t.net> | ||
3 | Date: Sun, 4 Dec 2022 17:40:21 +0000 | ||
4 | Subject: [PATCH 1/3] xkb: proof GetCountedString against request length | ||
5 | attacks | ||
6 | |||
7 | GetCountedString did a check for the whole string to be within the | ||
8 | request buffer but not for the initial 2 bytes that contain the length | ||
9 | field. A swapped client could send a malformed request to trigger a | ||
10 | swaps() on those bytes, writing into random memory. | ||
11 | |||
12 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
13 | |||
14 | Ustream-Status: Backport [https://cgit.freedesktop.org/xorg/xserver/commit/?id=11beef0b7f1ed290348e45618e5fa0d2bffcb72e] | ||
15 | CVE: CVE-2022-3550 | ||
16 | Signed-off-by:Minjae Kim <flowergom@gmail.com> | ||
17 | |||
18 | --- | ||
19 | xkb/xkb.c | 5 +++++ | ||
20 | 1 file changed, 5 insertions(+) | ||
21 | |||
22 | diff --git a/xkb/xkb.c b/xkb/xkb.c | ||
23 | index 68c59df..bf8aaa3 100644 | ||
24 | --- a/xkb/xkb.c | ||
25 | +++ b/xkb/xkb.c | ||
26 | @@ -5138,6 +5138,11 @@ _GetCountedString(char **wire_inout, ClientPtr client, char **str) | ||
27 | CARD16 len; | ||
28 | |||
29 | wire = *wire_inout; | ||
30 | + | ||
31 | + if (client->req_len < | ||
32 | + bytes_to_int32(wire + 2 - (char *) client->requestBuffer)) | ||
33 | + return BadValue; | ||
34 | + | ||
35 | len = *(CARD16 *) wire; | ||
36 | if (client->swapped) { | ||
37 | swaps(&len); | ||
38 | -- | ||
39 | 2.17.1 | ||
40 | |||