From nobody Tue Aug 06 19:43:54 2024 X-Original-To: dev-commits-src-all@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 4WdkJV3CfVz5SXTy; Tue, 06 Aug 2024 19:43:54 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WdkJV2Nfkz4M5L; Tue, 6 Aug 2024 19:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722973434; 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=6EK/gXhUpjZpkpHfubqX804N/y4N7d9k+JkyoJ6WINI=; b=cBIu35WL+9UDa4C4s2aVuQjAURt7avFdKNQ+lVE8OZEXx88Diy85RsCaBUU5Q61Lrh262H dCbRZ4Ls9GoSEqU/aMotIFuQ0tnyXJdxv3L2V325ikULDIqJK8YS07I/DpkAMGGBrus+a+ Scv6+K0cYlSXLkY6zstpcorKF74WPk0knKqcroZlnXxbZcYAAW5r3jTb74nva4vT7NQ1KL jBTTVVdLsghgUpmfsTfeZx/+VcBAmqOVz/YYmttiVGAaoksXOrCbsdAGvLhrBaXLYbfBUe l4zk9QtgTl2in4bjf4ReNCjgW1aSPSHLv17Pb3uym5yDjsySoClvOV8Rw+emsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722973434; a=rsa-sha256; cv=none; b=Xj94FwieUHcW//j0PYLsxhneHpJn5Cj0pVbQTZqC5ZBnyWvzlD+Q5gqbPxUkadtGH25GG6 N604Y/3ta6YkXc9H8rGgwcmn8O0DgpclbsZqso7v+k0gmLKE2zqb44GCgi/I10T8uDEa0o +RPeOM2dTh9b4I+YgaL7SmIwoyUN4XAc13Isr7t6GRCqQyCUM05nNaoYUeLeBa1aHvKFcC seV+don8R/wxo9ZHBJLZGtSQmtn6QTLWAAL0htz474WooJ2fvNV8xuxFXYHzAW/hycHZOX 4mXuQ0JYIkIHCVzCpUNkvgyi6f9J/SPKkuguNlfqi7FQFSbx0vGx5h9x51S0iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722973434; 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=6EK/gXhUpjZpkpHfubqX804N/y4N7d9k+JkyoJ6WINI=; b=rY8x9CnbIs0wrIbxPciCoZMHIt/DVEogHQYsBcDtVgvWQqvV2Po8P/LDP226OZw1pDmTzo AKJkZwHqEl3bqRNfgfLT1YpNJVQ5LRF9OvWjjfDon+AQdXSMikGLc1JS0mPpcuYCVj6g/w DlUiX6y1qkyQXPGBw7YVAGPfwOX6wH0i8sYXaI2C5d8zYD5Xc18smjrG5ayz2N/zsfCbMS qmN9CsjHFcqz4jF3Aypj32U1yYFVwDYr6S9vfK1Ob2v5sHVKBMEfLeS0PnDWd3+sGESina W5YP1qFY82tlkfJpRKRON94cOKIo/73gFuyBDH4VQv7it8sRpdVSf+6PdkKZOQ== 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 4WdkJV1dnyzKvS; Tue, 6 Aug 2024 19:43:54 +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 476JhsEG095770; Tue, 6 Aug 2024 19:43:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 476JhsNs095767; Tue, 6 Aug 2024 19:43:54 GMT (envelope-from git) Date: Tue, 6 Aug 2024 19:43:54 GMT Message-Id: <202408061943.476JhsNs095767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 73466449a9bf - stable/14 - sshd: remove blacklist call from grace_alarm_timer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 73466449a9bf1888147c53d622236cebc0aa591b Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=73466449a9bf1888147c53d622236cebc0aa591b commit 73466449a9bf1888147c53d622236cebc0aa591b Author: Ed Maste AuthorDate: 2024-08-01 00:04:46 +0000 Commit: Ed Maste CommitDate: 2024-08-06 19:39:40 +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 --- crypto/openssh/sshd.c | 2 -- crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 2 +- crypto/openssh/version.h | 2 +- 4 files changed, 3 insertions(+), 5 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), diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index a06f8fcc13d1..7f559775e3b3 100644 --- a/crypto/openssh/sshd_config +++ b/crypto/openssh/sshd_config @@ -105,7 +105,7 @@ AuthorizedKeysFile .ssh/authorized_keys #PermitTunnel no #ChrootDirectory none #UseBlacklist no -#VersionAddendum FreeBSD-20240318 +#VersionAddendum FreeBSD-20240806 # no default banner path #Banner none diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5 index 0715b1f9d581..4de510ac8795 100644 --- a/crypto/openssh/sshd_config.5 +++ b/crypto/openssh/sshd_config.5 @@ -1944,7 +1944,7 @@ The default is Optionally specifies additional text to append to the SSH protocol banner sent by the server upon connection. The default is -.Qq FreeBSD-20240318 . +.Qq FreeBSD-20240806 . The value .Cm none may be used to disable this. diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index 836b5650b247..82be0be8498f 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"