From nobody Wed Aug 07 15:39:38 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 4WfDrB71BYz5STfl; Wed, 07 Aug 2024 15:39:38 +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 4WfDrB1gBMz4qQ9; Wed, 7 Aug 2024 15:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723045178; 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=hufMV83xBn++6ddYo+vRcVKc98QLGmSdhvLl1THLPI4=; b=PiR3twuh7pOkh+T7K1GxNI5IsrlBuEaQqjQPnNqKvrfjvL9euQbDBFrJRcpyY3XWlbEwg6 TnNTbc6qOIchP/V80hcxzag4Ejw1osW4Oib3lkf4Fe9b+ITVZT+15/X5uDV/uNqxeQLutU xt1FV69e8ys1IRxv8hwfjJOEG08FKPP72ZXrHcBo08CR7DI3uYRn6LRDWLi3YwNJ4jlcns r7pVmuVu1CoF9yoxwC/jhLA3zO5wXV/PIVuSZfNNgp1YiklZnjYMfoSwx149pTS7aCdVie DlfEvym/lH/511hiTX93R67FcA5NxjJY2MmPg+7LB9diEqc8/YX1QmDfUxQlYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723045178; a=rsa-sha256; cv=none; b=OypQ6Vwb6tbQXmDSLz1Zmi3Nt+0rTRQ8cCM/nNVD7AW5RczbaTcJjvgsJdPtA74kSS0/XO sAxYGrh/xtfrF7l/EP2XYX5gJyy4WPZYmMZh4uOOD1QkSn1J1UeTRBdjRC/8kag98OX4ds TM4mSSIbKfDTvBAY5DHcA2Da2XA/RYcbFkYaGrDhTJOUK8FifH/7ZnCoFqn5G2+ccKBMDv sATo58gAyje502+iI3+dvsAa4AI/f2xY9IVOgr+PawqjETSqwPg+99x0sD/HUcFrQcMmHY 5wawZ2k4T4IiXDzaZuZT9Xs6Tk/VMktpzl+3jcKzpAbGmMgSDbQR+Y7AxKj6Pw== 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=1723045178; 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=hufMV83xBn++6ddYo+vRcVKc98QLGmSdhvLl1THLPI4=; b=ou8Df/FngfOHi96PVfQaX86MIWMEha2qZP5xzJcJ4w23ucyDorNhZcaHPJp6mdP8xDYGYL RYsqOvRLV5tn+NY8X1nu40xF2vgSvFA+uwZ5HCYSch7z5eW5L9j51gPgYzqPR9SNHtWGG8 3ndIGKCm3rg4rr8xefziaIVV89XlfDsvV/qW4tE5IU1/MeJiUPj0VvAVCZLHdjV4fam8Tg jtsCSetJLs0TuN5kmiQ58GV1Omc6cDF4adCipjV+d/MxjhkwQ0Leq0ZfigyJrdjrxgqm6R GTm+MYlXIN/7ElYBIaZB+789Hb2M/QdGkItQg3xCZax6sgSwsznRP6DNLy3aOA== 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 4WfDrB1GYHzwlC; Wed, 7 Aug 2024 15:39:38 +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 477FdcK2023624; Wed, 7 Aug 2024 15:39:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 477FdctO023621; Wed, 7 Aug 2024 15:39:38 GMT (envelope-from git) Date: Wed, 7 Aug 2024 15:39:38 GMT Message-Id: <202408071539.477FdctO023621@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: bd3aa40e0a55 - releng/13.4 - 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/releng/13.4 X-Git-Reftype: branch X-Git-Commit: bd3aa40e0a55f801abbb880c617f6c5695796d16 Auto-Submitted: auto-generated The branch releng/13.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bd3aa40e0a55f801abbb880c617f6c5695796d16 commit bd3aa40e0a55f801abbb880c617f6c5695796d16 Author: Ed Maste AuthorDate: 2024-08-01 00:04:46 +0000 Commit: Ed Maste CommitDate: 2024-08-07 15:39:06 +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) (cherry picked from commit d5f16ef6463d73270e4380f3498410c8ad91f495) Approved by: re (cperciva) --- 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"