diff --git a/fix-CVE-2024-6387.patch b/fix-CVE-2024-6387.patch new file mode 100644 index 0000000000000000000000000000000000000000..993151be8e5b815abc0701e0cb19e1f439b9d500 --- /dev/null +++ b/fix-CVE-2024-6387.patch @@ -0,0 +1,28 @@ +Reference:https://www.qualys.com/2024/07/01/cve-2024-6387/regresshion.txt +Conflict:NA +--- + log.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/log.c b/log.c +index dca08e4..5ca403a 100644 +--- a/log.c ++++ b/log.c +@@ -458,12 +458,14 @@ void + sshsigdie(const char *file, const char *func, int line, int showfunc, + LogLevel level, const char *suffix, const char *fmt, ...) + { ++#if 0 + va_list args; + + va_start(args, fmt); + sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL, + suffix, fmt, args); + va_end(args); ++#endif + _exit(1); + } + +-- +2.33.0 + diff --git a/openssh.spec b/openssh.spec index e8f41171534e33673495c5d404245024ff750f73..8a938e35c784ed56a6376b35ba8f5b893fbe516a 100644 --- a/openssh.spec +++ b/openssh.spec @@ -1,4 +1,4 @@ -%define anolis_release 6 +%define anolis_release 7 %global WITH_SELINUX 1 @@ -235,6 +235,8 @@ Patch1021: fix-CVE-2023-51384.patch Patch1022: fix-CVE-2023-51385.patch +Patch1023: fix-CVE-2024-6387.patch + License: BSD-3-Clause AND BSD-2-Clause AND ISC AND SSH-OpenSSH AND ssh-keyscan AND sprintf AND LicenseRef-Fedora-Public-Domain AND X11-distribute-modifications-variant Requires: /sbin/nologin @@ -455,6 +457,7 @@ popd %patch -P 1020 -p1 %patch -P 1021 -p1 %patch -P 1022 -p1 +%patch -P 1023 -p1 autoreconf pushd pam_ssh_agent_auth-pam_ssh_agent_auth-%{pam_ssh_agent_ver} @@ -766,6 +769,9 @@ test -f %{sysconfig_anaconda} && \ %endif %changelog +* Mon May 26 2025 Ali - 9.3p2-7 +- Fix CVE-2024-6387 + * Fri May 23 2025 Ali - 9.3p2-6 - Fix CVE-2023-51385