git: 2b4d38a47503 - releng/15.0 - openssh: blocklist: Remove non async-signal safe probe
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 16 Oct 2025 03:47:51 UTC
The branch releng/15.0 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=2b4d38a475032e1cf92a4aec5cad660e939df84d
commit 2b4d38a475032e1cf92a4aec5cad660e939df84d
Author: Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2025-10-15 13:29:30 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-10-16 03:47:33 +0000
openssh: blocklist: Remove non async-signal safe probe
BLOCKLIST_NOTIFY() is called within a signal handler for the alarm after
the grace period has expired that may only take async-signal safe
actions.
Approved by: re (cperciva)
Reviewed by: emaste
Fixes: e02003bce726 ("openssh: blocklist: Use NetBSD probes")
MFC after: 1 day
Differential Revision: https://reviews.freebsd.org/D53109
(cherry picked from commit 9c82c17c2a3ac61a69cb5337cb6f92ae88bc0b08)
(cherry picked from commit 7161c525abffe6cdb19ac01223d058fcbabf49c5)
---
crypto/openssh/sshd-session.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/crypto/openssh/sshd-session.c b/crypto/openssh/sshd-session.c
index e8299c254567..ca35790149ac 100644
--- a/crypto/openssh/sshd-session.c
+++ b/crypto/openssh/sshd-session.c
@@ -217,8 +217,6 @@ mm_is_monitor(void)
static void
grace_alarm_handler(int sig)
{
- BLOCKLIST_NOTIFY(the_active_state, BLOCKLIST_AUTH_FAIL,
- "Grace period expired");
/*
* Try to kill any processes that we have spawned, E.g. authorized
* keys command helpers or privsep children.