From nobody Wed Aug 7 13:44:58 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 4WfBHv0P18z5S9Rs; Wed, 07 Aug 2024 13:44:59 +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 4WfBHt34SPz4jr5; Wed, 7 Aug 2024 13:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723038298; 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=iVyfme+LHkQnaTblNv46WId0o8ziTHyql/IW2oIrzl4=; b=kFVU0x19aCcT1tPmTFm9pAZKmrXGo+QBSLHjPFc9Unx86Isqc1MjR992g2PwIIaW1Uyi0a H+TQ9gbKc8PUUHj+8TSdi6AaQsq3WoooVk8MGXBdbZbT3eYW3/o1CGfHsRYO8i5DbT4GxZ gY61pumVArotMS5/JBPQMkPAaizDS2G05iDuXHzUsdZufm68HNQdl5wGICi4ZuPjpCiW+4 gMd4WZ4utGPwml8pLJG4Ph970BWAUkK4T7c1439kr/Rqjlq87mT7Ix7/5Y2yU02HaoZzz2 QsI3G1UXCH1Wbsu3zXZvQBiDtAElP4CBSGE22182NmoZWU1F4QwW9jTtZMQocQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723038298; a=rsa-sha256; cv=none; b=VMpZYfknGtwp4WQwJoXaNiYvTWp9MjYPoL6YQFmSdOH+9o15DsbJMCBEVUqiZAtLUsjlIE fQwAtPdVwgPlaGqhR6r+t8W/Siz5wI4VuHwKSnDneoxXWr/whsUQ2rPyo4DrrRw5I0x9X2 IjcRcRf/zElfS7PapKteLMdiixT9d2FZMUGBtL+Qm1q6vjpC+9DB/6wp9NnCowDtm/cn/l 18l4YJZ5BLH6oyTGPVNF21qoF1VD9d1qJAtAitLn5y56LoNc9u3WnTaCkG7hCCz4rrQrn1 8vJFQX65zfutg4p+Ile//7pMm/K8zVswucxKodMgH7p3K2Uh9K4gm4ZOE8/29Q== 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=1723038298; 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=iVyfme+LHkQnaTblNv46WId0o8ziTHyql/IW2oIrzl4=; b=LS8ZXzDkpiBUtt0ooiLUbbaClsIxUbcAEQrSHwrpXKiYC/UhqUttVaGkDw6yOF0CvLeqlD DRuc0DTiWMEURp1XR6t8idY9bi3BjpihmpANYQA9dk06SPrAabztiOjLrM4JobfVdg7AFx f4oYVn8JGqew7keN3FKIMqOCJT2y6INMV8wVDnDi8oGLCfx6aCtedwH818W+0odTNtKZZ5 f3fe1sGIdL4Zm8wjoxyEbkj0r5+GYOKlorzU6EPlxls68pezXtmZAlkqRV7vKd+35EPXcF fs5nEskGfZSy9sAlTmZUTU08vOWBhPsPz+klfwhsX/vucMNU/cmb2EOtqPPAxQ== 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 4WfBHt2fPKzsmQ; Wed, 7 Aug 2024 13:44:58 +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 477DiwRN034921; Wed, 7 Aug 2024 13:44:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 477Diw1v034918; Wed, 7 Aug 2024 13:44:58 GMT (envelope-from git) Date: Wed, 7 Aug 2024 13:44:58 GMT Message-Id: <202408071344.477Diw1v034918@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: f41c11d7f209 - releng/13.3 - 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/13.3 X-Git-Reftype: branch X-Git-Commit: f41c11d7f2090e2628296602f46a0d5926c4b6fb Auto-Submitted: auto-generated The branch releng/13.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f41c11d7f2090e2628296602f46a0d5926c4b6fb commit f41c11d7f2090e2628296602f46a0d5926c4b6fb Author: Ed Maste AuthorDate: 2024-08-01 00:04:46 +0000 Commit: Mark Johnston CommitDate: 2024-08-07 13:37:37 +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 Security: FreeBSD-SA-24:08.openssh Security: CVE-2024-7589 (cherry picked from commit d5f16ef6463d73270e4380f3498410c8ad91f495) --- 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 6bb0b6c129bb..1ce62ec86e35 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 3e99bca450b1..d6108d00de09 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"