diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2024-08-01 00:04:46 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2024-08-07 13:37:37 +0000 |
| commit | f41c11d7f2090e2628296602f46a0d5926c4b6fb (patch) | |
| tree | 034675963ad22345f81e1afdcd8ebbd3e8b2f833 | |
| parent | 5eb30c313cb051385d654f7bba36143ccb7dbf94 (diff) | |
sshd: remove blacklist call from grace_alarm_timer
Under certain circumstances it may call log(3), which is not async-
signal-safe.
For now just remove the blacklist integration from this path, which
means that blacklistd will not detect and firewall hosts that establish
a connection but do nothing further.
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46203
(cherry picked from commit 2739a6845031e69be7c03461a9335d8bbb9f59bd)
(cherry picked from commit 3d3bae9b95388169d396adc8007585699c5a23e0)
(cherry picked from commit 73466449a9bf1888147c53d622236cebc0aa591b)
Approved by: so
Security: FreeBSD-SA-24:08.openssh
Security: CVE-2024-7589
(cherry picked from commit d5f16ef6463d73270e4380f3498410c8ad91f495)
| -rw-r--r-- | crypto/openssh/sshd.c | 2 | ||||
| -rw-r--r-- | crypto/openssh/version.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c index 6bb0b6c129bb..1ce62ec86e35 100644 --- a/crypto/openssh/sshd.c +++ b/crypto/openssh/sshd.c @@ -377,8 +377,6 @@ grace_alarm_handler(int sig) kill(0, SIGTERM); } - BLACKLIST_NOTIFY(the_active_state, BLACKLIST_AUTH_FAIL, "ssh"); - /* Log error and exit. */ sigdie("Timeout before authentication for %s port %d", ssh_remote_ipaddr(the_active_state), diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index 3e99bca450b1..d6108d00de09 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -5,4 +5,4 @@ #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -#define SSH_VERSION_FREEBSD "FreeBSD-20240701" +#define SSH_VERSION_FREEBSD "FreeBSD-20240806" |