Details: https://nvd.nist.gov/vuln/detail/CVE-2025-26597
Pick the patch that explicitly mentions this CVE ID in its commit message. Signed-off-by: Gyorgy Sarvari <[email protected]> --- .../tigervnc/files/CVE-2025-26597.patch | 48 +++++++++++++++++++ .../tigervnc/tigervnc_1.11.0.bb | 1 + 2 files changed, 49 insertions(+) create mode 100644 meta-oe/recipes-graphics/tigervnc/files/CVE-2025-26597.patch diff --git a/meta-oe/recipes-graphics/tigervnc/files/CVE-2025-26597.patch b/meta-oe/recipes-graphics/tigervnc/files/CVE-2025-26597.patch new file mode 100644 index 0000000000..814d58adda --- /dev/null +++ b/meta-oe/recipes-graphics/tigervnc/files/CVE-2025-26597.patch @@ -0,0 +1,48 @@ +From ba8a4f0af806a1d078037f23c051253e9e2d7efb Mon Sep 17 00:00:00 2001 +From: Gyorgy Sarvari <[email protected]> +Date: Thu, 28 Nov 2024 14:09:04 +0100 +Subject: [PATCH] xkb: Fix buffer overflow in XkbChangeTypesOfKey() + +From: Olivier Fourdan <[email protected]> + +If XkbChangeTypesOfKey() is called with nGroups == 0, it will resize the +key syms to 0 but leave the key actions unchanged. + +If later, the same function is called with a non-zero value for nGroups, +this will cause a buffer overflow because the key actions are of the wrong +size. + +To avoid the issue, make sure to resize both the key syms and key actions +when nGroups is 0. + +CVE-2025-26597, ZDI-CAN-25683 + +This vulnerability was discovered by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Signed-off-by: Olivier Fourdan <[email protected]> +Reviewed-by: Peter Hutterer <[email protected]> +(cherry picked from commit 0e4ed94952b255c04fe910f6a1d9c852878dcd64) + +Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1830> +(cherry picked from commit 8cb23fac62e05d7340e320b2db0dd3e8538d1fba) + +CVE: CVE-2025-26597 +Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/8cb23fac62e05d7340e320b2db0dd3e8538d1fba] +Signed-off-by: Gyorgy Sarvari <[email protected]> +--- + xkb/XKBMisc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c +index f17194528..c45471686 100644 +--- a/xkb/XKBMisc.c ++++ b/xkb/XKBMisc.c +@@ -553,6 +553,7 @@ XkbChangeTypesOfKey(XkbDescPtr xkb, + i = XkbSetNumGroups(i, 0); + xkb->map->key_sym_map[key].group_info = i; + XkbResizeKeySyms(xkb, key, 0); ++ XkbResizeKeyActions(xkb, key, 0); + return Success; + } + diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb index e97f82f6e7..caa44ea0d6 100644 --- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb +++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb @@ -29,6 +29,7 @@ SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.11-branch;protocol=ht file://CVE-2025-26594-2.patch;patchdir=${XORG_S} \ file://CVE-2025-26595.patch;patchdir=${XORG_S} \ file://CVE-2025-26596.patch;patchdir=${XORG_S} \ + file://CVE-2025-26597.patch;patchdir=${XORG_S} \ " # Keep sync with xorg-server in oe-core
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#123949): https://lists.openembedded.org/g/openembedded-devel/message/123949 Mute This Topic: https://lists.openembedded.org/mt/117487437/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
