fix CVE-2024-6409

Signed-off-by: Corwin-Song <songjuntao@kylinos.cn>
(cherry picked from commit 7d112ee7f10801f8739d84a43400373e03464709)

backport-fix-CVE-2024-6409.patch

@@ -0,0 +1,22 @@
+Reference:https://www.openwall.com/lists/oss-security/2024/07/08/2
+Conflict:NA
+---
+ sshd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sshd.c b/sshd.c
+index cf7381e..04b7357 100644
+--- a/sshd.c
++++ b/sshd.c
+@@ -384,7 +384,7 @@ grace_alarm_handler(int sig)
+ 
+ 	/* Log error and exit. */
+ 	if (use_privsep && pmonitor != NULL && pmonitor->m_pid <= 0)
+-		cleanup_exit(255); /* don't log in privsep child */
++		_exit(1); /* don't log in privsep child */
+ 	else {
+ 		sigdie("Timeout before authentication for %s port %d",
+ 		    ssh_remote_ipaddr(the_active_state),
+-- 
+2.43.0
+

openssh.spec

@@ -6,7 +6,7 @@
 %{?no_gtk2:%global gtk2 0}
 
 %global sshd_uid    74
-%global openssh_release 31
+%global openssh_release 32
 
 Name:           openssh
 Version:        8.8p1
@@ -132,6 +132,7 @@ Patch102:       backport-CVE-2023-51385-upstream-ban-user-hostnames-with-most-sh
 Patch103:       backport-CVE-2023-48795.patch
 Patch104:       fix-memory-leak-in-kex-exchange.patch 
 Patch105:       backport-fix-CVE-2024-6387.patch
+Patch106:       backport-fix-CVE-2024-6409.patch
 
 Requires:       /sbin/nologin
 Requires:       libselinux >= 2.3-5 audit-libs >= 1.0.8
@@ -314,6 +315,7 @@ popd
 %patch103 -p1
 %patch104 -p1
 %patch105 -p1
+%patch106 -p1
 
 autoreconf
 pushd pam_ssh_agent_auth-pam_ssh_agent_auth-0.10.4
@@ -520,6 +522,12 @@ getent passwd sshd >/dev/null || \
 %attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
 
 %changelog
+* Wed Jul 10 2024 songjuntao<songjuntao@kylinos.cn> - 8.8p1-32
+- Type:CVE
+- CVE:CVE-2024-6409
+- SUG:NA
+- DESC:Fix CVE-2024-6409
+
 * Tue Jul 2 2024 renmingshuai<renmingshuai@huawei.com> - 8.8p1-31
 - Type:CVE
 - CVE:CVE-2024-6387