From nobody Thu Oct 16 00:35:04 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 4cn89h3nXkz6C3R5; Thu, 16 Oct 2025 00:35:04 +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 4cn89h3093z3dmB; Thu, 16 Oct 2025 00:35:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760574904; 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=9cORiDZr8erHhm9ir3cbz2HFhZhKItgkRcWdcVX+qDk=; b=nbuysDJDYKZHfcXb1qu39cR4u15TLDI4YwDpmHxAhLTsrPoOs85bxXQSQBDxLJAcQ5CKrz 0G3KFrhwEkmBdS1Qf0ulBU+0pmf9T1f/KhBgpSI6YA24Ir7ZSnjnzPnf7a+hT19i6+rEJi 1licXYzAH4iFcCPuZiY9YTTlTYEB7HIgwx3kas4sfOKSOiH6fr0fqjX+0bGkqgElNK0Qy8 MRJso8y/o9fI06az4Zk6bGkdIMPAJeRACTW4qSaRVeVZCk+eIP2NAkW+/GP6t1UrRhqY6j P7u14wYJI+bhpf1M1GNz5HWyKH86gBeg5B9pPdt+KyCYVZbkpP88bTzzceegtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760574904; 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=9cORiDZr8erHhm9ir3cbz2HFhZhKItgkRcWdcVX+qDk=; b=ioP1c4Dhk5hfY003tHIqk9XbiAIRhU8SxyqA0URUhxUkRTRayGH9PPFrwFw9IYgqvq17cy p41/gYTivXfhnvsp7Y8QBZP6SKAtuF88I06OpgzAXAVmja33l+31AqhntMrwQQXtzdTcuc mXAaHphtF9cTGJ7LMA79b/rH8ayqZaUhNOUQ1tJATyHluSjjrJ2Lwovsv7Nvly9X9Pu4xq hb2AHB77cnI6OU1lNVna6d9pK73qGS7J/JI8ZLJyzQByzpHhs/KfdGsrRGT/00Tzkhd9nE cfXxnbjTqqa/bokocAjhbgXwo8P4OlJcmqwEbIhEovueGDYOUa+OovqjuTi92Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760574904; a=rsa-sha256; cv=none; b=nbatxN+GR8FXLXe5hEk9a8ZXYGCnlr7A1G2NB06sp0vpXnBURa/EcLYujvlFrWELtOg/MJ YNsPjImAxHNLwP9vPqaJNG24oOgLxRKd3RdZAP5B/BGpo1Q3jqJK1NvDIZ3kBJwzuDHOXp +rXRvCYacnWj1hBS9cXLe35Nd2u9cEDtIj2iEcQCW5r8n681Xvzk9beS5Q3bOtv28Pgrif a0tZ4RESgKvz4enKcrn+bRcc2bfgR+e+Gl4+N2dBL9frOs2+KM72c4U7lfZM8HdgjjH7uE 98gye9vc0DOWpZM3UW5bPyVcge58ZSP/t756onE1ExVHEowMpm6Ad/9Xe+gpKw== 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 4cn89h2Xcwz11qt; Thu, 16 Oct 2025 00:35:04 +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 59G0Z4d3011653; Thu, 16 Oct 2025 00:35:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59G0Z4tX011650; Thu, 16 Oct 2025 00:35:04 GMT (envelope-from git) Date: Thu, 16 Oct 2025 00:35:04 GMT Message-Id: <202510160035.59G0Z4tX011650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 7161c525abff - stable/15 - 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7161c525abffe6cdb19ac01223d058fcbabf49c5 Auto-Submitted: auto-generated The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=7161c525abffe6cdb19ac01223d058fcbabf49c5 commit 7161c525abffe6cdb19ac01223d058fcbabf49c5 Author: Jose Luis Duran AuthorDate: 2025-10-15 13:29:30 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-16 00:30:07 +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. 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) --- 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.