Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Aug 2024 19:18:10 GMT
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 2739a6845031 - main - sshd: remove blacklist call from grace_alarm_timer
Message-ID:  <202408061918.476JIAn2046770@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste:

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

commit 2739a6845031e69be7c03461a9335d8bbb9f59bd
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-08-01 00:04:46 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-08-06 19:14:00 +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
---
 crypto/openssh/sshd.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c
index 0c83e0ea468e..889f2056bc75 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),



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408061918.476JIAn2046770>