From bc8497d53e6360981d00a19cfc4e10eb5d247982 Mon Sep 17 00:00:00 2001 From: Corwin-Song Date: Fri, 26 Jan 2024 14:36:04 +0800 Subject: [PATCH] fix memory leak in kex2 exchange function Signed-off-by: Corwin-Song --- fix-memory-leak-in-kex-exchange.patch | 25 +++++++++++++++++++++++++ openssh.spec | 10 +++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 fix-memory-leak-in-kex-exchange.patch diff --git a/fix-memory-leak-in-kex-exchange.patch b/fix-memory-leak-in-kex-exchange.patch new file mode 100644 index 0000000..c742434 --- /dev/null +++ b/fix-memory-leak-in-kex-exchange.patch @@ -0,0 +1,25 @@ +From 7a7862590cbe1f7a9d8957fdc78f324a1bdfc520 Mon Sep 17 00:00:00 2001 +From: songjuntao +Date: Fri, 2 Feb 2024 15:55:13 +0800 +Subject: [PATCH] fix memory leak in kex exchange function + +Signed-off-by: songjuntao +--- + sshconnect2.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sshconnect2.c b/sshconnect2.c +index b6e2197..d3ceee4 100644 +--- a/sshconnect2.c ++++ b/sshconnect2.c +@@ -385,6 +385,7 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr *hostaddr, u_short port, + free(prop_kex); + free(prop_enc); + free(prop_hostkey); ++ free(s); + } + + /* +-- +2.33.0 + diff --git a/openssh.spec b/openssh.spec index e747362..c39cafc 100644 --- a/openssh.spec +++ b/openssh.spec @@ -6,7 +6,7 @@ %{?no_gtk2:%global gtk2 0} %global sshd_uid 74 -%global openssh_release 26 +%global openssh_release 27 Name: openssh Version: 8.8p1 @@ -131,6 +131,7 @@ Patch100: backport-fix-CVE-2023-38408-upstream-terminate-process.patch Patch101: backport-upstream-In-channel_request_remote_forwarding-the-pa.patch Patch102: backport-CVE-2023-51385-upstream-ban-user-hostnames-with-most-shell-metachar.patch Patch103: backport-CVE-2023-48795.patch +Patch104: fix-memory-leak-in-kex-exchange.patch Requires: /sbin/nologin Requires: libselinux >= 2.3-5 audit-libs >= 1.0.8 @@ -312,6 +313,7 @@ popd %patch101 -p1 %patch102 -p1 %patch103 -p1 +%patch104 -p1 autoreconf pushd pam_ssh_agent_auth-pam_ssh_agent_auth-0.10.4 @@ -508,6 +510,12 @@ getent passwd sshd >/dev/null || \ %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* %changelog +* Fri Jan 26 2024 songjuntao - 8.8p1-27 +- Type:bugfix +- CVE: +- SUG:NA +- DESC: fix memory leak in kex2 exchange function + * Wed Jan 10 2024 renmingshuai - 8.8p1-26 - Type:CVE - CVE:CVE-2023-48795 -- Gitee