Module Name: src
Committed By: martin
Date: Mon Jul 1 20:03:34 UTC 2024
Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-9]: log.c version.h
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1854):
crypto/external/bsd/openssh/dist/log.c: revision 1.29
crypto/external/bsd/openssh/dist/version.h (patch)
sshd(8): Avoid strnvis and syslog_r in signal handler context.
CVE-2024-6387
PR security/58386
To generate a diff of this commit:
cvs rdiff -u -r1.20.2.1 -r1.20.2.2 src/crypto/external/bsd/openssh/dist/log.c
cvs rdiff -u -r1.28.2.2 -r1.28.2.3 \
src/crypto/external/bsd/openssh/dist/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/log.c
diff -u src/crypto/external/bsd/openssh/dist/log.c:1.20.2.1 src/crypto/external/bsd/openssh/dist/log.c:1.20.2.2
--- src/crypto/external/bsd/openssh/dist/log.c:1.20.2.1 Mon Dec 25 12:31:05 2023
+++ src/crypto/external/bsd/openssh/dist/log.c Mon Jul 1 20:03:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: log.c,v 1.20.2.1 2023/12/25 12:31:05 martin Exp $ */
+/* $NetBSD: log.c,v 1.20.2.2 2024/07/01 20:03:34 martin Exp $ */
/* $OpenBSD: log.c,v 1.61 2023/12/06 21:06:48 djm Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: log.c,v 1.20.2.1 2023/12/25 12:31:05 martin Exp $");
+__RCSID("$NetBSD: log.c,v 1.20.2.2 2024/07/01 20:03:34 martin Exp $");
#include <sys/types.h>
#include <sys/uio.h>
@@ -430,12 +430,14 @@ void
sshsigdie(const char *file, const char *func, int line, int showfunc,
LogLevel level, const char *suffix, const char *fmt, ...)
{
+#ifdef SYSLOG_R_SAFE_IN_SIGHAND
va_list args;
va_start(args, fmt);
sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL,
suffix, fmt, args);
va_end(args);
+#endif
_exit(1);
}
Index: src/crypto/external/bsd/openssh/dist/version.h
diff -u src/crypto/external/bsd/openssh/dist/version.h:1.28.2.2 src/crypto/external/bsd/openssh/dist/version.h:1.28.2.3
--- src/crypto/external/bsd/openssh/dist/version.h:1.28.2.2 Mon Dec 25 12:31:10 2023
+++ src/crypto/external/bsd/openssh/dist/version.h Mon Jul 1 20:03:34 2024
@@ -1,8 +1,8 @@
-/* $NetBSD: version.h,v 1.28.2.2 2023/12/25 12:31:10 martin Exp $ */
+/* $NetBSD: version.h,v 1.28.2.3 2024/07/01 20:03:34 martin Exp $ */
/* $OpenBSD: version.h,v 1.100 2023/12/18 14:48:44 djm Exp $ */
#define __OPENSSH_VERSION "OpenSSH_9.6"
-#define __NETBSDSSH_VERSION "NetBSD_Secure_Shell-20231220"
+#define __NETBSDSSH_VERSION "NetBSD_Secure_Shell-20240701"
#define SSH_HPN "-hpn13v14"
#define SSH_LPK "-lpk"
/*
