From nobody Tue Aug 06 19:46:19 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 4WdkMJ29bVz5SXbX; Tue, 06 Aug 2024 19:46:20 +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 4WdkMJ1fzbz4MV0; Tue, 6 Aug 2024 19:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722973580; 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=1k2QIiakN19gveCBQxpiG0TGijUsgrXvlRqLq9z6m6g=; b=bd/EsCoU3P0N8tx55eCnJH3CjFIHD8D74YGfL+uEK4iRI3S9ToDO7ck4FgA2Ez4T6eG5T0 U0ZkN6qXmDT7fAIhnP5EHyRs38d7jXyX0ItKSSTcKkbGLqukGx9axqz8sGmq+f1g5oYcCF P1XYFmOtZZZSrWZ7XzmBC9e1GNC7azfXs758V7U0d9Sq8AnsTGz4XQxAmGgm4ZrPhNL8tC +PS6VHJ1dPn//Mk+xk6Ttkf6SO1eDXTY/46U/4/FUKs40RwITpGCEDRtYzzDWI5GmWxo+g MlJefgdFmf3Jetd+ob/2vC5earJ5F0Vh6OCOmGs5bZhVV2vQfJRyPtwCb5vMew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722973580; a=rsa-sha256; cv=none; b=NVdZx7goKctn5KEB9CqddSzmNh1m1xN2jCheLAwVfuHNoNq3BnyHgUFhWE5fRY0+hYRkKr NPu7EhKkR1oowYESClH99yVU7zxNmX+ZfsiexIriuXa3pR7qGQbTKqus6b5LIOMNFei/WS zgioIMJjhyAjaOIT76uPLfiWVX3XVbtlIygilmH1OqTAa+Fm9EnTaQgCMdHNUHecTkUggr uNFPRet37/Gt4jVvD/YzzfekVyew6bhwqEzpfIOb39D7ThsD+u18xlCSig+TmDDW+InFe4 UUckeZnydFHf3irIvy+27TwfFirvDvY6tpSI7FXtiNK5LMEEpCS3iF49oo+crg== 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=1722973580; 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=1k2QIiakN19gveCBQxpiG0TGijUsgrXvlRqLq9z6m6g=; b=Sm/VhZ5Z4vhSqNo3Rn0vcAZ/VZ2OKy22VLs9UXYPa2KBqvPtm8JrvZAqbRK20VpWrgcqqR AvgaiFsX69JNZUIV/AUDSwcz8mTUcByeCDm5WE+Ye5H/KExN5JDerLkdJk2fyAjyN3L3+B vFp5wMzNdlO5GwGKunUvIosOup9TvghSxGZwqLAm7TBhLD2ZgfZAK2MoIeEDwWSlcfy5ED hoNPGGhMpDsKV2WCrhb2wvIlXHak4mYryvUYcgjvJNWUV4njomEDJz6/kNzg4RYjGjewpR lZUq7H4qyZIHL/nBcvDbJzusxirw859g0KreQS3EBmqWGVxMhO17ZfPsD45+Ag== 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 4WdkMJ0zxTzKrq; Tue, 6 Aug 2024 19:46:20 +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 476JkJTr096224; Tue, 6 Aug 2024 19:46:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 476JkJCb096221; Tue, 6 Aug 2024 19:46:19 GMT (envelope-from git) Date: Tue, 6 Aug 2024 19:46:19 GMT Message-Id: <202408061946.476JkJCb096221@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: d5f16ef6463d - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: d5f16ef6463d73270e4380f3498410c8ad91f495 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d5f16ef6463d73270e4380f3498410c8ad91f495 commit d5f16ef6463d73270e4380f3498410c8ad91f495 Author: Ed Maste AuthorDate: 2024-08-01 00:04:46 +0000 Commit: Ed Maste CommitDate: 2024-08-06 19:46:01 +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) (cherry picked from commit 73466449a9bf1888147c53d622236cebc0aa591b) Approved by: so --- crypto/openssh/ssh_config | 2 +- crypto/openssh/ssh_config.5 | 2 +- crypto/openssh/sshd.c | 2 -- crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 2 +- crypto/openssh/version.h | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config index 36c6c7785fd2..a047ce2deb93 100644 --- a/crypto/openssh/ssh_config +++ b/crypto/openssh/ssh_config @@ -44,4 +44,4 @@ # ProxyCommand ssh -q -W %h:%p gateway.example.com # RekeyLimit 1G 1h # UserKnownHostsFile ~/.ssh/known_hosts.d/%k -# VersionAddendum FreeBSD-20240318 +# VersionAddendum FreeBSD-20240806 diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5 index 020d254f7f0d..de1903ba43a2 100644 --- a/crypto/openssh/ssh_config.5 +++ b/crypto/openssh/ssh_config.5 @@ -2137,7 +2137,7 @@ in Specifies a string to append to the regular version string to identify OS- or site-specific modifications. The default is -.Dq FreeBSD-20240318 . +.Dq FreeBSD-20240806 . The value .Cm none may be used to disable this. 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 54a1d9d486d0..866e905d9515 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 1c3de78d1cf0..a354c1ef2b0a 100644 --- a/crypto/openssh/sshd_config.5 +++ b/crypto/openssh/sshd_config.5 @@ -1947,7 +1947,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"