From ce7ff80a454856a0aa652fce9da2ca1f9731debf Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Fri, 11 Nov 2022 13:37:52 +0100
Subject: [PATCH] Import Debian changes 2:1.20.11-1+deb11u3
---
debian/changelog | 7 +++
...ntedString-against-request-length-at.patch | 34 +++++++++++
...possible-memleaks-in-XkbGetKbdByName.patch | 59 +++++++++++++++++++
debian/patches/series | 2 +
4 files changed, 102 insertions(+)
create mode 100644 debian/patches/11_xkb-proof-GetCountedString-against-request-length-at.patch
create mode 100644 debian/patches/12_xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch
diff --git a/debian/changelog b/debian/changelog
index 56c0412..7daa951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.20.11-1+deb11u3) bullseye-security; urgency=medium
+
+ * xkb: proof GetCountedString against request length attacks (CVE-2022-3550)
+ * xkb: fix some possible memleaks in XkbGetKbdByName (CVE-2022-3551)
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Fri, 11 Nov 2022 13:37:52 +0100
+
xorg-server (2:1.20.11-1+deb11u2) bullseye-security; urgency=medium
* xkb: add request length validation for XkbSetGeometry (CVE-2022-2319)
diff --git a/debian/patches/11_xkb-proof-GetCountedString-against-request-length-at.patch b/debian/patches/11_xkb-proof-GetCountedString-against-request-length-at.patch
new file mode 100644
index 0000000..79b171e
--- /dev/null
+++ b/debian/patches/11_xkb-proof-GetCountedString-against-request-length-at.patch
@@ -0,0 +1,34 @@
+From 11beef0b7f1ed290348e45618e5fa0d2bffcb72e Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 5 Jul 2022 12:06:20 +1000
+Subject: [PATCH] xkb: proof GetCountedString against request length attacks
+
+GetCountedString did a check for the whole string to be within the
+request buffer but not for the initial 2 bytes that contain the length
+field. A swapped client could send a malformed request to trigger a
+swaps() on those bytes, writing into random memory.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ xkb/xkb.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/xkb/xkb.c b/xkb/xkb.c
+index f42f59ef3..1841cff26 100644
+--- a/xkb/xkb.c
++++ b/xkb/xkb.c
+@@ -5137,6 +5137,11 @@ _GetCountedString(char **wire_inout, ClientPtr client, char **str)
+ CARD16 len;
+
+ wire = *wire_inout;
++
++ if (client->req_len <
++ bytes_to_int32(wire + 2 - (char *) client->requestBuffer))
++ return BadValue;
++
+ len = *(CARD16 *) wire;
+ if (client->swapped) {
+ swaps(&len);
+--
+2.30.2
+
diff --git a/debian/patches/12_xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch b/debian/patches/12_xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch
new file mode 100644
index 0000000..1173d67
--- /dev/null
+++ b/debian/patches/12_xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch
@@ -0,0 +1,59 @@
+From 18f91b950e22c2a342a4fbc55e9ddf7534a707d2 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 13 Jul 2022 11:23:09 +1000
+Subject: [PATCH] xkb: fix some possible memleaks in XkbGetKbdByName
+
+GetComponentByName returns an allocated string, so let's free that if we
+fail somewhere.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ xkb/xkb.c | 26 ++++++++++++++++++++------
+ 1 file changed, 20 insertions(+), 6 deletions(-)
+
+diff --git a/xkb/xkb.c b/xkb/xkb.c
+index 4692895db..b79a269e3 100644
+--- a/xkb/xkb.c
++++ b/xkb/xkb.c
+@@ -5935,18 +5935,32 @@ ProcXkbGetKbdByName(ClientPtr client)
+ xkb = dev->key->xkbInfo->desc;
+ status = Success;
+ str = (unsigned char *) &stuff[1];
+- if (GetComponentSpec(&str, TRUE, &status)) /* keymap, unsupported */
+- return BadMatch;
++ {
++ char *keymap = GetComponentSpec(&str, TRUE, &status); /* keymap, unsupported */
++ if (keymap) {
++ free(keymap);
++ return BadMatch;
++ }
++ }
+ names.keycodes = GetComponentSpec(&str, TRUE, &status);
+ names.types = GetComponentSpec(&str, TRUE, &status);
+ names.compat = GetComponentSpec(&str, TRUE, &status);
+ names.symbols = GetComponentSpec(&str, TRUE, &status);
+ names.geometry = GetComponentSpec(&str, TRUE, &status);
+- if (status != Success)
++ if (status == Success) {
++ len = str - ((unsigned char *) stuff);
++ if ((XkbPaddedSize(len) / 4) != stuff->length)
++ status = BadLength;
++ }
++
++ if (status != Success) {
++ free(names.keycodes);
++ free(names.types);
++ free(names.compat);
++ free(names.symbols);
++ free(names.geometry);
+ return status;
+- len = str - ((unsigned char *) stuff);
+- if ((XkbPaddedSize(len) / 4) != stuff->length)
+- return BadLength;
++ }
+
+ CHK_MASK_LEGAL(0x01, stuff->want, XkbGBN_AllComponentsMask);
+ CHK_MASK_LEGAL(0x02, stuff->need, XkbGBN_AllComponentsMask);
+--
+2.30.2
+
diff --git a/debian/patches/series b/debian/patches/series
index b259e93..faae57a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,5 @@
08_xkb-switch-to-array-index-loops-to-moving-pointers.patch
09_xkb-add-request-length-validation-for-XkbSetGeometry.patch
10_xkb-swap-XkbSetDeviceInfo-and-XkbSetDeviceInfoCheck.patch
+11_xkb-proof-GetCountedString-against-request-length-at.patch
+12_xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch
--
GitLab