From: Peter Marko <peter.marko@siemens.com>
Date: Wed, 15 Apr 2026 18:23:11 +0000 (+0200)
Subject: inetutils: patch CVE-2026-32746
X-Git-Tag: yocto-6.0~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=716d3f6fd98778666cc0eaa2ba3afbef91801ed5;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

inetutils: patch CVE-2026-32746

Pick patch [1] as mentioned in [2].

[1] https://cgit.git.savannah.gnu.org/cgit/inetutils.git/commit/?id=6864598a29b652a6b69a958f5cd1318aa2b258af
[2] https://security-tracker.debian.org/tracker/CVE-2026-32746

Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-connectivity/inetutils/inetutils/CVE-2026-32746.patch b/meta/recipes-connectivity/inetutils/inetutils/CVE-2026-32746.patch
new file mode 100644
index 0000000000..63dd8b8c58
--- /dev/null
+++ b/meta/recipes-connectivity/inetutils/inetutils/CVE-2026-32746.patch
@@ -0,0 +1,55 @@
+From 6864598a29b652a6b69a958f5cd1318aa2b258af Mon Sep 17 00:00:00 2001
+From: Collin Funk <collin.funk1@gmail.com>
+Date: Wed, 11 Mar 2026 23:06:46 -0700
+Subject: [PATCH] telnetd: fix stack buffer overflow processing SLC suboption
+ triplets
+
+Previously a client could write past the end of an internal buffer using
+an SLC suboption with many triplets using function octets greater than
+18, possibly leading to remote code execution. Reported by Adiel Sol,
+Arad Inbar, Erez Cohen, Nir Somech, Ben Grinberg, Daniel Lubel at DREAM
+Security Research Team at:
+<https://lists.gnu.org/r/bug-inetutils/2026-03/msg00031.html>.
+
+* telnetd/slc.c (add_slc): Return early if writing the tuple would lead
+us to writing past the end of the buffer.
+* NEWS.md: Mention the fix.
+
+CVE: CVE-2026-32746
+Upstream-Status: Backport [https://cgit.git.savannah.gnu.org/cgit/inetutils.git/commit/?id=6864598a29b652a6b69a958f5cd1318aa2b258af]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ NEWS          | 6 ++++++
+ telnetd/slc.c | 3 +++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/NEWS b/NEWS
+index 5fe1e4c5..c03d22f4 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,5 +1,11 @@
+ GNU inetutils NEWS -- history of user-visible changes.
+ 
++** telnetd no longer allows clients to write past the end of a stack
++allocated buffer, possibly leading to remote code execution, using an
++SLC suboption with many triplets using function octets greater than 18.
++Reported by Adiel Sol, Arad Inbar, Erez Cohen, Nir Somech, Ben Grinberg,
++Daniel Lubel at DREAM Security Research Team.
++
+ ** Prevent privilege escalation via telnetd abusing systemd service
+ credentials support added to the login(1) implementation of util-linux
+ in release 2.40.  Reported by Ron Ben Yizhak in
+diff --git a/telnetd/slc.c b/telnetd/slc.c
+index f45e7725..2dfef22f 100644
+--- a/telnetd/slc.c
++++ b/telnetd/slc.c
+@@ -162,6 +162,9 @@ get_slc_defaults (void)
+ void
+ add_slc (char func, char flag, cc_t val)
+ {
++  /* Do nothing if the entire triplet cannot fit in the buffer.  */
++  if (slcbuf + sizeof slcbuf - slcptr <= 6)
++    return;
+ 
+   if ((*slcptr++ = (unsigned char) func) == 0xff)
+     *slcptr++ = 0xff;
diff --git a/meta/recipes-connectivity/inetutils/inetutils_2.7.bb b/meta/recipes-connectivity/inetutils/inetutils_2.7.bb
index e555e318a8..a3b0b20768 100644
--- a/meta/recipes-connectivity/inetutils/inetutils_2.7.bb
+++ b/meta/recipes-connectivity/inetutils/inetutils_2.7.bb
@@ -21,6 +21,7 @@ SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
            file://CVE-2026-24061-01.patch \
            file://CVE-2026-24061-02.patch \
            file://CVE-2026-28372.patch \
+           file://CVE-2026-32746.patch \
            "
 
 inherit autotools gettext update-alternatives texinfo