Blame openssh-9.8p1-upstream-cve-2024-6387.patch
|
Dmitry Belyavskiy |
96149a |
diff -up openssh-8.7p1/log.c.xxx openssh-8.7p1/log.c
|
|
Dmitry Belyavskiy |
96149a |
--- openssh-8.7p1/log.c.xxx 2024-06-28 11:02:43.949912398 +0200
|
|
Dmitry Belyavskiy |
96149a |
+++ openssh-8.7p1/log.c 2024-06-28 11:02:58.652297885 +0200
|
|
Dmitry Belyavskiy |
96149a |
@@ -455,12 +455,14 @@ void
|
|
Dmitry Belyavskiy |
96149a |
sshsigdie(const char *file, const char *func, int line, int showfunc,
|
|
Dmitry Belyavskiy |
96149a |
LogLevel level, const char *suffix, const char *fmt, ...)
|
|
Dmitry Belyavskiy |
96149a |
{
|
|
Dmitry Belyavskiy |
96149a |
+#if 0
|
|
Dmitry Belyavskiy |
96149a |
va_list args;
|
|
Dmitry Belyavskiy |
96149a |
|
|
Dmitry Belyavskiy |
96149a |
va_start(args, fmt);
|
|
Dmitry Belyavskiy |
96149a |
sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL,
|
|
Dmitry Belyavskiy |
96149a |
suffix, fmt, args);
|
|
Dmitry Belyavskiy |
96149a |
va_end(args);
|
|
Dmitry Belyavskiy |
96149a |
+#endif
|
|
Dmitry Belyavskiy |
96149a |
_exit(1);
|
|
Dmitry Belyavskiy |
96149a |
}
|
|
Dmitry Belyavskiy |
96149a |
|
|
Dmitry Belyavskiy |
2a5b65 |
diff -up openssh-8.7p1/sshd.c.xxx openssh-8.7p1/sshd.c
|
|
Dmitry Belyavskiy |
2a5b65 |
--- openssh-8.7p1/sshd.c.xxx 2024-07-01 10:33:04.332907749 +0200
|
|
Dmitry Belyavskiy |
2a5b65 |
+++ openssh-8.7p1/sshd.c 2024-07-01 10:33:47.843998038 +0200
|
|
Dmitry Belyavskiy |
2a5b65 |
@@ -384,7 +384,7 @@ grace_alarm_handler(int sig)
|
|
Dmitry Belyavskiy |
2a5b65 |
|
|
Dmitry Belyavskiy |
2a5b65 |
/* Log error and exit. */
|
|
Dmitry Belyavskiy |
2a5b65 |
if (use_privsep && pmonitor != NULL && pmonitor->m_pid <= 0)
|
|
Dmitry Belyavskiy |
2a5b65 |
- cleanup_exit(255); /* don't log in privsep child */
|
|
Dmitry Belyavskiy |
2a5b65 |
+ _exit(255); /* don't log in privsep child */
|
|
Dmitry Belyavskiy |
2a5b65 |
else {
|
|
Dmitry Belyavskiy |
2a5b65 |
sigdie("Timeout before authentication for %s port %d",
|
|
Dmitry Belyavskiy |
2a5b65 |
ssh_remote_ipaddr(the_active_state),
|