-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
net-misc/openssh: Backport patch for CVE-2024-6387
Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
- Loading branch information
1 parent
993c139
commit 6e8892c
Showing
2 changed files
with
35 additions
and
0 deletions.
There are no files selected for viewing
34 changes: 34 additions & 0 deletions
34
.../src/third_party/coreos-overlay/net-misc/openssh/files/openssh-9.1_p1-CVE-2024-6387.patch
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,34 @@ | ||
From 200e59c2d58b27906c07a98b33420dc92ebc5920 Mon Sep 17 00:00:00 2001 | ||
From: Sayan Chowdhury <schowdhury@microsoft.com> | ||
Date: Mon, 1 Jul 2024 19:14:55 +0530 | ||
Subject: [PATCH] This applies upstream's backport suggestions from | ||
https://marc.info/?l=oss-security&m=171982317624594&w=2 for both | ||
CVE-2024-6387 | ||
|
||
Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com> | ||
--- | ||
log.c | 2 ++ | ||
1 file changed, 2 insertions(+) | ||
|
||
diff --git a/log.c b/log.c | ||
index 99bf046a7..10e41bde7 100644 | ||
--- a/log.c | ||
+++ b/log.c | ||
@@ -451,12 +451,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); | ||
} | ||
|
||
-- | ||
2.45.0 | ||
|
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