From owner-dev-commits-src-main@freebsd.org Thu Sep 23 08:55:09 2021 Return-Path: Delivered-To: dev-commits-src-main@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 92D4167B77C; Thu, 23 Sep 2021 08:55:09 +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 4HFTWd3X07z3lsW; Thu, 23 Sep 2021 08:55:09 +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 59EB728197; Thu, 23 Sep 2021 08:55:09 +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 18N8t9NM099693; Thu, 23 Sep 2021 08:55:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18N8t9k5099692; Thu, 23 Sep 2021 08:55:09 GMT (envelope-from git) Date: Thu, 23 Sep 2021 08:55:09 GMT Message-Id: <202109230855.18N8t9k5099692@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wojciech Macek Subject: git: 492bf4fdad4d - main - veriexec: Fix veriexec -i's confusion between loaded and locked states MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wma X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 492bf4fdad4dbb96b82d88e12918e61042f71661 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Sep 2021 08:55:09 -0000 The branch main has been updated by wma: URL: https://cgit.FreeBSD.org/src/commit/?id=492bf4fdad4dbb96b82d88e12918e61042f71661 commit 492bf4fdad4dbb96b82d88e12918e61042f71661 Author: Stephane Rochoy AuthorDate: 2021-09-23 08:53:56 +0000 Commit: Wojciech Macek CommitDate: 2021-09-23 08:53:56 +0000 veriexec: Fix veriexec -i's confusion between loaded and locked states Calling veriexec -i locked return the state of loaded and vice-versa. Differential revision: https://reviews.freebsd.org/D30952 Reviewed by: sjg,imp Obtained from: Stromshield --- sbin/veriexec/veriexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/veriexec/veriexec.c b/sbin/veriexec/veriexec.c index c1facbd4a9fa..1eb7a9af7d6f 100644 --- a/sbin/veriexec/veriexec.c +++ b/sbin/veriexec/veriexec.c @@ -91,7 +91,7 @@ main(int argc, char *argv[]) ctl = VERIEXEC_STATE_ENFORCE; break; case 'l': /* loaded/locked */ - ctl = (strncmp(optarg, "lock", 4)) ? + ctl = (strncmp(optarg, "lock", 4) == 0) ? VERIEXEC_STATE_LOCKED : VERIEXEC_STATE_LOADED; break;