From nobody Wed Aug 07 13:44:26 2024 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 4WfBHH27p3z5S97V; Wed, 07 Aug 2024 13:44:27 +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 4WfBHH0hlLz4hm4; Wed, 7 Aug 2024 13:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723038267; 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=OOKkTYTddnrAE/+9BpzUQI2C2LheFb36kZCwEvrw8Ho=; b=FcAbwgZg0WbUVvyg0B6lN0FcFU86eTbO5ci2Z+NsIT+Fkt3x3xiKOToj74Ybq0WquaeDuA 6cb03TsnWruKfUmnUOWMj/z4D38pmNtWL7xTbY/NY2f29P8erAE89bUi2Qg0/MQTvP/V/T D5TGJ+uAZBKxssGzpRV6TBGW2GiLXar5HFUn2El1yID0JiqYZTFlgYsTge5MjibNCOyHjY 4erOYGs783pdgRI3p1kSMQjn6q4NsgFXsQsGUK1M1xiPycdXhR5s+1sEBUM5SovU97+u2S awz8EH0cFh7Hndlh99naGPWM3xH0IyEKDUlkHumYVGSLqGFr2x5SSX7ZDHwFsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723038267; a=rsa-sha256; cv=none; b=ALg3A9nL297kXYVewqyb7onwCuZoII1cpMFxujZnlCqqN0wNY201wToOXuMGEMu8pAzgDS gujW1K8ooxtCSBqawUm2uR0AbVmilEFIlbqkgZwdjUx2yxR1zqAa1HNm7KDRf0UPhK171P LnOIqnXEOOWNVNpnuqAHT6ns0YTPD3F+CQKBnrX7z5Sb3ELMAbBOdRm1EjI7O/eIVH9Yry 9gBXJ0gVP3qzOGhwT0wTtjZq9LqC1fw+aYamUA1JM98t7s7tHWBtkRNou9WumRbAUwSDJi PH19RsISXXViVJPW2XDCAl2c8cA0NB4TIOL6F1m8WTG5hfLJR+4yZOGwwEBoqA== 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=1723038267; 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=OOKkTYTddnrAE/+9BpzUQI2C2LheFb36kZCwEvrw8Ho=; b=OJ1t2O85snELnDcb/BlMDeoPZnUORK978FfNTrNXXpLuabh4n3Rek1mLOOnEfAWoXSv8/v bfk/fUcSX+A5PqdalwnTMYBhkRZQVkdXgVxktJUQuUunLlnh+2uVxAQsjYUwGID2Z8o/hv 57qjXMuqyEKEBn1UvalzilA5oPmvkeXHMXbgLYCRHGjr7grY/GNyZoP6aXJjMCzJjf6Fp5 RMwghkxdZb1IrKDLpLjVt3FPncVW/nC4V84OeZtIwS81AoKg0eBABzX3kKhr4g4gfE1y8T WGzEOho+JI7qG24OK1QP8dQzfBtnmHib1BAy42Zbure5OZOg7z1F+TsclevpdA== 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 4WfBHH0K17zsgf; Wed, 7 Aug 2024 13:44:27 +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 477DiQqN033626; Wed, 7 Aug 2024 13:44:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 477DiQIA033623; Wed, 7 Aug 2024 13:44:26 GMT (envelope-from git) Date: Wed, 7 Aug 2024 13:44:26 GMT Message-Id: <202408071344.477DiQIA033623@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 450425089212 - releng/14.1 - sshd: remove blacklist call from grace_alarm_timer 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 4504250892124d6282ca931dd5f612afb8b799f6 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4504250892124d6282ca931dd5f612afb8b799f6 commit 4504250892124d6282ca931dd5f612afb8b799f6 Author: Ed Maste AuthorDate: 2024-08-01 00:04:46 +0000 Commit: Mark Johnston CommitDate: 2024-08-07 13:32:25 +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 Security: FreeBSD-SA-24:08.openssh Security: CVE-2024-7589 (cherry picked from commit 73466449a9bf1888147c53d622236cebc0aa591b) --- 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"