mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-10 00:04:06 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/openssh: apply security patch for CVE-2025-32728 (sshd)

Browse Source 
Fixes:
https://www.cve.org/CVERecord?id=CVE-2025-32728

Signed-off-by: Titouan Christophe <titouan.christophe@mind.be>
[Julien: add link to CVE in commit log]
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Titouan Christophe
2025-05-15 12:27:16 +02:00
committed by Julien Olivain
parent aaa50b0e61
commit 211e822d43
2 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
package/openssh/0001-fix-logic-error-in-disableforwarding-option.patch Normal file
View File

@@ -0,0 +1,49 @@
From fc86875e6acb36401dfc1dfb6b628a9d1460f367 Mon Sep 17 00:00:00 2001
From: "djm@openbsd.org" <djm@openbsd.org>
Date: Wed, 9 Apr 2025 07:00:03 +0000
Subject: [PATCH] upstream: Fix logic error in DisableForwarding option.
This option was documented as disabling X11 and agent forwarding but it failed to do so.
Spotted by Tim Rice.
OpenBSD-Commit-ID: fffc89195968f7eedd2fc57f0b1f1ef3193f5ed1
Upstream: https://github.com/openssh/openssh-portable/commit/fc86875e6acb36401dfc1dfb6b628a9d1460f367
Fixes the following CVE:
- CVE-2025-32728: In sshd in OpenSSH before 10.0, the DisableForwarding
directive does not adhere to the documentation stating
that it disables X11 and agent forwarding.
[Titouan:
- Remove diff on OpenBSD comment at the top of the file that does not apply
cleanly on openssh 9.9
]
Signed-off-by: Titouan Christophe <titouan.christophe@mind.be>
---
session.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/session.c b/session.c
index 52a4a3446e6..6444c77f31c 100644
--- a/session.c
+++ b/session.c
@@ -2171,7 +2171,8 @@ session_auth_agent_req(struct ssh *ssh, Session *s)
if ((r = sshpkt_get_end(ssh)) != 0)
sshpkt_fatal(ssh, r, "%s: parse packet", __func__);
if (!auth_opts->permit_agent_forwarding_flag ||
- !options.allow_agent_forwarding) {
+ !options.allow_agent_forwarding ||
+ options.disable_forwarding) {
debug_f("agent forwarding disabled");
return 0;
}
@@ -2566,7 +2567,7 @@ session_setup_x11fwd(struct ssh *ssh, Session *s)
ssh_packet_send_debug(ssh, "X11 forwarding disabled by key options.");
return 0;
}
- if (!options.x11_forwarding) {
+ if (!options.x11_forwarding || options.disable_forwarding) {
debug("X11 forwarding disabled in server configuration file.");
return 0;
}

3
package/openssh/openssh.mk
View File

@@ -13,6 +13,9 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain
OPENSSH_LICENSE_FILES = LICENCE OPENSSH_LICENSE_FILES = LICENCE
# 0001-fix-logic-error-in-disableforwarding-option.patch
OPENSSH_IGNORE_CVES += CVE-2025-32728
OPENSSH_CONF_ENV = \ OPENSSH_CONF_ENV = \
LD="$(TARGET_CC)" \ LD="$(TARGET_CC)" \
LDFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_CFLAGS)" \