From nobody Wed Aug 07 13:44:40 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 4WfBHY15NBz5S9L7; Wed, 07 Aug 2024 13:44:41 +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 4WfBHX6yw1z4jNB; Wed, 7 Aug 2024 13:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723038281; 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=QNkqo+rlQiIscrkEtDheFl7zQvuyD+2BrXWoNiqIelo=; b=oCA2OKjSR5ahnK5fknNyzSCgwSc2yooGTSbCOCmbVELbV9lTYB6efsq2/UyApS8Mtee5mY lLUOoG+6ld9tyPIicoeRXgoHC+6Kv/jK0o3dvB7+fyJjU8gaVtKdxbspkH9460TraRx2Q2 ILpsVEWbkVciBcBwsap7v0BpIeKrX7uby5S5P0g6JNthEIZOBZcPNkwIvZ3dSlEzm8vUMb U7qiKM2fIn3mTBDW9MQw4RiaaiJZW683lkxHw04LQiPf7tKWyty2AVTu3zMmUwOokVv8hM 0s6KgRNsTu02GRjoR7HsCGAK5Xo8uJijTFi9Wp59QAcwrndgYQvmCT9gbJyK7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723038281; a=rsa-sha256; cv=none; b=oXdA8SrlMeo7/ok2xaCVdxwyeu8c5UhbRdQQKrgh6TaDq450dhNikq3vOdUe32VfWAaqey ydyPCgJaSPetRpiAfXfvSBgjBZs6i4DvApRdSXZ6NCajsUeSf22Ol5iJhQPWgTEDhgX9gV zU68j6yzwuNHxOTDlpmsEl4cBXKveWpfdRloJlTOqgt/VUfPHm3jQlwtuZ5vzvGOC2Kl+o CTS/OZY/WhwJMSDozBw1QiDDaD8ZLsoOmwGT32YOHu9LgvIGk9158L+apuGsHF1tWg89RM NA9X7YI32TxDUOD+BrpgaC7kwXe4SjEQtcOz4f6xvNCs9rzpZAVGyewwcsOAVA== 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=1723038281; 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=QNkqo+rlQiIscrkEtDheFl7zQvuyD+2BrXWoNiqIelo=; b=WIaSKxWtB2fHWd1Uc2FXBHZD3NPdkB2hsn90nS/0oISTEpiRTwsEK8kz2sLcWOdJ3l21SE naXj+J9XSvgbONpZOtnshsYoVYvkLrawNlF1NLROMQSbemawPFPq0ErZyAiMbVQFWyffcv wqvXhT3dG6Zr4Qd0tBSakOcHrG4ZTk5qWUkYiqOauCoUyB8Aff7VEpVb8uZUjztfOwElt3 te2+b/ptBLCPfC7aFID6ISeJdw2ifmh5IrE9hZaWg6LkUcHLWw0Tw2eDeNzJJvC5cVj1ov MZPk6bgwICwoK4k1MQzS1pE869Z7oUEH4RCRElZ2m7phlE+LANi4qIL1ZIi5eQ== 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 4WfBHX6ZzmzsrZ; Wed, 7 Aug 2024 13:44:40 +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 477DieKO034063; Wed, 7 Aug 2024 13:44:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 477DiesM034060; Wed, 7 Aug 2024 13:44:40 GMT (envelope-from git) Date: Wed, 7 Aug 2024 13:44:40 GMT Message-Id: <202408071344.477DiesM034060@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: c4ade13d5498 - releng/14.0 - 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.0 X-Git-Reftype: branch X-Git-Commit: c4ade13d5498870de2cae09f5468aca0d73c126f Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c4ade13d5498870de2cae09f5468aca0d73c126f commit c4ade13d5498870de2cae09f5468aca0d73c126f Author: Ed Maste AuthorDate: 2024-08-01 00:04:46 +0000 Commit: Mark Johnston CommitDate: 2024-08-07 13:25:50 +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/version.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c index cfdd61ec5747..79ec505fcfe7 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/version.h b/crypto/openssh/version.h index 56d02fbe9c86..3dcb560362d3 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"