From owner-dev-commits-src-all@freebsd.org Sun Jun 20 19:11:24 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 2907F657AB8; Sun, 20 Jun 2021 19:11:24 +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 4G7MhX0XsBz4d75; Sun, 20 Jun 2021 19:11:24 +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 EA89C71BF; Sun, 20 Jun 2021 19:11:23 +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 15KJBN40017786; Sun, 20 Jun 2021 19:11:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15KJBNrL017785; Sun, 20 Jun 2021 19:11:23 GMT (envelope-from git) Date: Sun, 20 Jun 2021 19:11:23 GMT Message-Id: <202106201911.15KJBNrL017785@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: d8d0df35b353 - stable/12 - cpucontrol: fix extended signature matching code to avoid fallthough 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/stable/12 X-Git-Reftype: branch X-Git-Commit: d8d0df35b353f9f0ae507d40b699a689a06ac252 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: Sun, 20 Jun 2021 19:11:24 -0000 The branch stable/12 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d8d0df35b353f9f0ae507d40b699a689a06ac252 commit d8d0df35b353f9f0ae507d40b699a689a06ac252 Author: Dan Nelson AuthorDate: 2021-06-14 19:28:16 +0000 Commit: Mark Johnston CommitDate: 2021-06-20 19:10:28 +0000 cpucontrol: fix extended signature matching code to avoid fallthough PR: 256502 (cherry picked from commit 87799c5f85dc0aed7e53ca841504e3b2ffc88498) --- usr.sbin/cpucontrol/intel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/cpucontrol/intel.c b/usr.sbin/cpucontrol/intel.c index dfe86f7185c6..f4700898d5eb 100644 --- a/usr.sbin/cpucontrol/intel.c +++ b/usr.sbin/cpucontrol/intel.c @@ -242,8 +242,8 @@ no_table: (flags & ext_table[i].cpu_flags) != 0) goto matched; } - } else - goto fail; + } + goto fail; matched: if (revision >= fw_header->revision) {