-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
openssh: use 9.6p1 by default, patched against CVE-2024-6387
- Loading branch information
Showing
4 changed files
with
57 additions
and
0 deletions.
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
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,19 @@ | ||
https://bugs.gentoo.org/935271 | ||
Backport proposed by upstream at https://marc.info/?l=oss-security&m=171982317624594&w=2. | ||
--- 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); | ||
} | ||
|
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,16 @@ | ||
"Minor logic error in ObscureKeystrokeTiming" | ||
https://marc.info/?l=oss-security&m=171982317624594&w=2 | ||
--- a/clientloop.c | ||
+++ b/clientloop.c | ||
@@ -608,8 +608,9 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout, | ||
if (timespeccmp(&now, &chaff_until, >=)) { | ||
/* Stop if there have been no keystrokes for a while */ | ||
stop_reason = "chaff time expired"; | ||
- } else if (timespeccmp(&now, &next_interval, >=)) { | ||
- /* Otherwise if we were due to send, then send chaff */ | ||
+ } else if (timespeccmp(&now, &next_interval, >=) && | ||
+ !ssh_packet_have_data_to_write(ssh)) { | ||
+ /* If due to send but have no data, then send chaff */ | ||
if (send_chaff(ssh)) | ||
nchaff++; | ||
} |
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