From owner-dev-commits-src-all@freebsd.org Thu Sep 16 18:11:37 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A555D67EC11; Thu, 16 Sep 2021 18:11:37 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H9QBx4H6cz3Nnh; Thu, 16 Sep 2021 18:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 70DDF26139; Thu, 16 Sep 2021 18:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18GIBbgR070474; Thu, 16 Sep 2021 18:11:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18GIBbRS070473; Thu, 16 Sep 2021 18:11:37 GMT (envelope-from git) Date: Thu, 16 Sep 2021 18:11:37 GMT Message-Id: <202109161811.18GIBbRS070473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: adb56e58e8db - main - openssh: use global state for blacklist in grace_alarm_handler 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/main X-Git-Reftype: branch X-Git-Commit: adb56e58e8db84d8087ebe3d3e7def0074cb5a90 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2021 18:11:37 -0000 The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=adb56e58e8db84d8087ebe3d3e7def0074cb5a90 commit adb56e58e8db84d8087ebe3d3e7def0074cb5a90 Author: Ed Maste AuthorDate: 2021-09-16 18:08:27 +0000 Commit: Ed Maste CommitDate: 2021-09-16 18:10:11 +0000 openssh: use global state for blacklist in grace_alarm_handler Obtained from: security/openssh-portable Fixes: 19261079b743 ("openssh: update to OpenSSH v8.7p1") Sponsored by: The FreeBSD Foundation --- crypto/openssh/sshd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c index 864ad09b29fc..25a3769b4823 100644 --- a/crypto/openssh/sshd.c +++ b/crypto/openssh/sshd.c @@ -385,7 +385,7 @@ grace_alarm_handler(int sig) kill(0, SIGTERM); } - BLACKLIST_NOTIFY(NULL, BLACKLIST_AUTH_FAIL, "ssh"); + BLACKLIST_NOTIFY(the_active_state, BLACKLIST_AUTH_FAIL, "ssh"); /* Log error and exit. */ if (use_privsep && pmonitor != NULL && pmonitor->m_pid <= 0)