git: c4ade13d5498 - releng/14.0 - sshd: remove blacklist call from grace_alarm_timer

The branch releng/14.0 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=c4ade13d5498870de2cae09f5468aca0d73c126f

commit c4ade13d5498870de2cae09f5468aca0d73c126f
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-08-01 00:04:46 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-08-07 13:25:50 +0000

    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)
    
    Approved by:    so
    Security:       FreeBSD-SA-24:08.openssh
    Security:       CVE-2024-7589
    
    (cherry picked from commit 73466449a9bf1888147c53d622236cebc0aa591b)
---
 crypto/openssh/sshd.c    | 2 --
 crypto/openssh/version.h | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c
index cfdd61ec5747..79ec505fcfe7 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 56d02fbe9c86..3dcb560362d3 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"