package/xserver_xorg-server: add upstream security fixes for CVE-2022-355{0, 1}
PATCH 1/1 package/xserver_xorg-server: add upstream security fixes for CVE-2022-355{0, 1}
Fixes the following security issues:
- CVE-2022-3550: A vulnerability classified as critical was found in X.org Server. Affected by this vulnerability is the function _GetCountedString of the file xkb/xkb.c. The manipulation leads to buffer overflow. It is recommended to apply a patch to fix this issue. The associated identifier of this vulnerability is VDB-211051.
- CVE-2022-3551: A vulnerability, which was classified as problematic, has been found in X.org Server. Affected by this issue is the function ProcXkbGetKbdByName of the file xkb/xkb.c. The manipulation leads to memory leak. It is recommended to apply a patch to fix this issue. The identifier of this vulnerability is VDB-211052.
--- ...ntedString-against-request-length-at.patch | 35 +++++++++++ ...possible-memleaks-in-XkbGetKbdByName.patch | 60 +++++++++++++++++++ .../xserver_xorg-server.mk | 7 +++ 3 files changed, 102 insertions(+) create mode 100644 package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch create mode 100644 package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch
package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 11beef0b7f1ed290348e45618e5fa0d2bffcb72e Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <[email protected]> +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 <[email protected]> +Signed-off-by: Peter Korsgaard <[email protected]> +--- + 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 +
package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch new file +60 -0
60 lines not on this page · raw message
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +7 -0
@@ -11,6 +11,13 @@ XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING XSERVER_XORG_SERVER_SELINUX_MODULES = xdg xserver XSERVER_XORG_SERVER_INSTALL_STAGING = YES + +# 0002-xkb-proof-GetCountedString-against-request-length-at.patch +XSERVER_XORG_SERVER_IGNORE_CVES += CVE-2022-3550 + +# 0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch +XSERVER_XORG_SERVER_IGNORE_CVES += CVE-2022-3551 + XSERVER_XORG_SERVER_DEPENDENCIES = \ xutil_util-macros \ xlib_libX11 \
Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Petazzoni via buildroot
AppliedQuoted 14 lines · On Sun, 11 Dec 2022 12:09:07 +0100 Peter Korsgaard <[email protected]> wrote:
Fixes the following security issues:
- CVE-2022-3550: A vulnerability classified as critical was found in X.org Server. Affected by this vulnerability is the function
_GetCountedStringof the filexkb/xkb.c. The manipulation leads to buffer overflow. It is recommended to apply a patch to fix this issue. The associated identifier of this vulnerability is VDB-211051.- CVE-2022-3551: A vulnerability, which was classified as problematic, has been found in X.org Server. Affected by this issue is the function ProcXkbGetKbdByName of the file
xkb/xkb.c. The manipulation leads to memory leak. It is recommended to apply a patch to fix this issue. The identifier of this vulnerability is VDB-211052.
Quoted 8 lines
Signed-off-by Peter Korsgaard <[email protected]>--- ...ntedString-against-request-length-at.patch | 35 +++++++++++ ...possible-memleaks-in-XkbGetKbdByName.patch | 60 +++++++++++++++++++ .../xserver_xorg-server.mk | 7 +++ 3 files changed, 102 insertions(+) create mode 100644 package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch create mode 100644 package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch
Applied to master, thanks.
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot