From 9f95a36728b788fdadc3fdb569cff8ba6686a3c4 Mon Sep 17 00:00:00 2001 From: zhangshaoning Date: Mon, 15 Sep 2025 17:06:46 +0800 Subject: [PATCH] fix duplicate warn --- openssh-9.6p1-fix-duplicate-warn.patch | 26 ++++++++++++++++++++++++++ openssh.spec | 10 +++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 openssh-9.6p1-fix-duplicate-warn.patch diff --git a/openssh-9.6p1-fix-duplicate-warn.patch b/openssh-9.6p1-fix-duplicate-warn.patch new file mode 100644 index 0000000..34b9414 --- /dev/null +++ b/openssh-9.6p1-fix-duplicate-warn.patch @@ -0,0 +1,26 @@ +From 9ca4c1175f43e54a79859d04a0cedd33bc32349e Mon Sep 17 00:00:00 2001 +From: zhangshaoning +Date: Mon, 15 Sep 2025 16:54:04 +0800 +Subject: [PATCH] fix duplicate warn + +--- + monitor_wrap.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/monitor_wrap.c b/monitor_wrap.c +index 47fc0a1..5f8a6e9 100644 +--- a/monitor_wrap.c ++++ b/monitor_wrap.c +@@ -714,8 +714,7 @@ mm_do_pam_account(void) + mm_request_receive_expect(pmonitor->m_recvfd, + MONITOR_ANS_PAM_ACCOUNT, m); + if ((r = sshbuf_get_u32(m, &ret)) != 0 || +- (r = sshbuf_get_cstring(m, &msg, &msglen)) != 0 || +- (r = sshbuf_put(loginmsg, msg, msglen)) != 0) ++ (r = sshbuf_get_cstring(m, &msg, &msglen)) != 0 ) + fatal("%s: buffer error: %s", __func__, ssh_err(r)); + + free(msg); +-- +2.18.2 + diff --git a/openssh.spec b/openssh.spec index 2fe5ab6..84f2996 100644 --- a/openssh.spec +++ b/openssh.spec @@ -6,7 +6,7 @@ %{?no_gtk2:%global gtk2 0} %global sshd_uid 74 -%global openssh_release 7 +%global openssh_release 8 Name: openssh Version: 9.6p1 @@ -114,6 +114,7 @@ Patch73: backport-fix-CVE-2024-39894.patch Patch74: backport-fix-CVE-2025-26465.patch Patch75: backport-fix-CVE-2025-26466.patch Patch76: backport-fix-CVE-2025-32728.patch +Patch77: openssh-9.6p1-fix-duplicate-warn.patch Requires: /sbin/nologin Requires: libselinux >= 2.3-5 audit-libs >= 1.0.8 @@ -274,6 +275,7 @@ popd %patch -P 74 -p1 %patch -P 75 -p1 %patch -P 76 -p1 +%patch -P 77 -p1 autoreconf pushd pam_ssh_agent_auth-pam_ssh_agent_auth-0.10.4 @@ -505,6 +507,12 @@ fi %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* %changelog +* Mon Sep 15 2025 zhangshaoning - 9.6p1-8 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix duplicate warn + * Tue Jul 29 2025 zhangbinqin - 9.6p1-7 - Type:bugfix - CVE:NA -- Gitee