From nobody Thu Oct 16 03:47:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cnDS74bP9z6CNs7; Thu, 16 Oct 2025 03:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cnDS73yBDz42YQ; Thu, 16 Oct 2025 03:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760586471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uuer8RSq7v1ojywrvbFzzvHHzwBzzVSDBSb/ggeXuVY=; b=nLa66kVnbXDJZ5TNH1G8bFRQQUSg/vsSicj0VaokbrFnYGO90Cg+cbVzoQZrqo/qSjctGr yG8tDPzPqjRwshNxMPFaKGM+nLPMrSFEJ3PxxI96pubq4VCjWcQy/Dm6oXCpnO8iOir0aO BgFq273JxYo3c2iYPsEzcROMPubEPBSMTl6Ke6wTELDFgh1rHOLihD6P19UENQyvC/13Ol mGZaNJ2xfwGWvSXqWwUJWO6Oql/w+FivhAN0LzawBlWwPvOJU5TI5X6T0+wPfxUgnCDm0O 06tdOPeYQx7bDeIjjzWF3ZipqBQH/SRnYprmJaRDJY1sK0aVGVnbE4nxMrOOAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760586471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uuer8RSq7v1ojywrvbFzzvHHzwBzzVSDBSb/ggeXuVY=; b=RuEC98GD+rK9eamwh5zDwGRN/5qTCvbczPP+ZhHzfY39A+TBvZDv1HU4CEEZ/7de/cBVOH 62NorQVICMVQZrW514SyEOpTtArmHrfLhmWC+muobwHnUTRkN29RQ1n/wPESKqUsgw4rGP GFa5GlmvpvXg8GuJAyL9w1DerPhVnEHLuGiAzS6N2ZL2Q5DMB3jUO7tOLExBwq9GwDZu4D ebl6Dtjhtmf/oD/ursT7qqmaQdpIgbYgFN46Na7NMLn5zBL9R17WVJ8twxWM6BWM4mqazO gn2obcTyjStzPm3fkrAQ98epSTq9gUTrO9B3q1QBGPrmrnK7MIDKMoVKI8PEUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760586471; a=rsa-sha256; cv=none; b=NGKoE+JRxDuuy9JRRLtDDC+jmDt+EuDwDmyQUn8ILFXggjBVRu19wRaXmYzfdvM8yAFPYX xK6kZpB4dwcwbuygazd6ZXC+1t86rYeP8DNnh3xxe2+Y2zo1iokghDZNu7gnEERKmphl5M 2fAHB6RSFceT1WQD8C9N7KccJiwyWvp/xff2RD2MUe4oddw6Sm/SRzz1lDiJ11GMTpbx6C kMkFwHXR/P7XBNBj9e7rH9a8a1KMQsk5zXuT7ildUtdjW+VC5F6958qb2jls1yh05T7PNK K/BrywApCEpvL+7I0HjSTWkIvCI2/VVQ+hSNLbeXJSNSiT7fQgwrxyOGfemGMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cnDS73Tnzz16yL; Thu, 16 Oct 2025 03:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59G3lp3V070874; Thu, 16 Oct 2025 03:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59G3lpUd070871; Thu, 16 Oct 2025 03:47:51 GMT (envelope-from git) Date: Thu, 16 Oct 2025 03:47:51 GMT Message-Id: <202510160347.59G3lpUd070871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 2b4d38a47503 - releng/15.0 - openssh: blocklist: Remove non async-signal safe probe List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 2b4d38a475032e1cf92a4aec5cad660e939df84d Auto-Submitted: auto-generated 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 AuthorDate: 2025-10-15 13:29:30 +0000 Commit: Colin Percival 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.