-
Notifications
You must be signed in to change notification settings - Fork 540
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[AUTO-CHERRYPICK] openssh: fix "regresshion" CVE, CVE-2024-6387, with…
… patch from debian. - branch main (#9565) Co-authored-by: SeanDougherty <sdougherty@microsoft.com>
- Loading branch information
1 parent
8728caa
commit 450c3cc
Showing
2 changed files
with
39 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
From 46bbf63bfa678cfb48ba8f2c0012101db5b3c691 Mon Sep 17 00:00:00 2001 | ||
From: Sean Dougherty <sdougherty@microsoft.com> | ||
Date: Tue, 2 Jul 2024 18:20:49 +0000 | ||
Subject: [PATCH] Description: fix signal handler race condition for | ||
Regresshion CVE. https://nvd.nist.gov/vuln/detail/CVE-2024-6387 | ||
|
||
--- | ||
log.c | 3 ++- | ||
1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/log.c b/log.c | ||
index 99bf046..2d231ca 100644 | ||
--- a/log.c | ||
+++ b/log.c | ||
@@ -451,12 +451,13 @@ 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.39.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters