From nobody Fri Apr 14 05:14:45 2023 X-Original-To: dev-commits-src-all@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 4PyPlB3FT2z45R8x; Fri, 14 Apr 2023 05:14:46 +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 4PyPlB188Mz4Ql0; Fri, 14 Apr 2023 05:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681449286; 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=x+ntDwLEOaHCCxTX5gjRtMadeDPrlAH/LOWMY6Os4LQ=; b=j5VHTbGRKNZlpK4h7XSGOZijSAyLFLA5yI8fWXDGKno3FcvecFtNSUHrmIaDxM+qKwfrK5 76bA2tl8Nck6szCks/cmKQ2Prh3QBlyM4Gd0HHQPf/eGQkU5SmoSX2W3XA4YmqxlHv7xRf G5ZbnHA25Kpk+IkTr+TaTcpqVFrmvrLKMLJe8Hs4N52A/aRJflOuNLmOhoy28a1F0cocmS +JHog3aXWgCaDxJEg+mt0JhXo0fQE4mr8BFWe0SlooQowf7+sGwqb2rgGuKuXm4Oljinkt K3pOotExh40k5jbM3iX3PeSCz3B1gSsOubyBxOXVADeEgWlVIXImsoBWTeLhpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681449286; 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=x+ntDwLEOaHCCxTX5gjRtMadeDPrlAH/LOWMY6Os4LQ=; b=n/QC/E70bun5m5Ngqf2T847zY5z5YvbfiDsmlkNAyEGUiHcCxJrTIjhP567tRh9ybAeAy9 er5Fy+3IpFGYITQEbFOz2sPVrzXzJgqCKlbyDryVED2YXIXCrVHjJ0UTnDiUTMYIlCPX0m MoJKJg8MMyuQT9ZNjqAIqny4KBnhdlaBrPOfoUlrYifzXSWIgO4Tb8t7jN+zqQypvuLcqG fLYNuwy0hWyCtOe2ZWSVdWvVoUGsU0IdrgbQQsZpDnyElfOliUN4VhKKfSZnr0vhCJE7mE 4JeOujbiDAbtwjltZybm0Ozy8XjHUhGpg9yvQxnocynoPKxzNloNBjnctzxrcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681449286; a=rsa-sha256; cv=none; b=QcOgCVYC8fcpC1nt7ZTHE5ioef3jVH2jy936tNxzpPtNp5DT05apbfn3uQwrF9fQMjbeAR AatiwGlVIk2Og7Z35MLLwxV3ffv6gpF2tTKN002SEuZ15QZdjOeVH6RUmfEN6+m/JKu/jM sV2r/mF4f8hs0rK1m9n22tEC7jhTjAsV9pLthTFMIeUBinWdH5aPdThjR7vxyjSzic53FE xc1H4MvdbxnCIu4QV5NTXE85s4R8HomycWJWs5eU5tZ8ABJ5nHjMvJ4R5dG27CDwQ2fJcV U0bydd4QCnlzk34/2f5Xlz85WEUOqAVHHClQ3ohR8cG0WtccwKGMFpkff3xfew== 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 4PyPl96mC8z1BJc; Fri, 14 Apr 2023 05:14:45 +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 33E5EjHG019806; Fri, 14 Apr 2023 05:14:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33E5Ejqd019805; Fri, 14 Apr 2023 05:14:45 GMT (envelope-from git) Date: Fri, 14 Apr 2023 05:14:45 GMT Message-Id: <202304140514.33E5Ejqd019805@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e900898601b4 - stable/13 - veriexec: Fix veriexec -i's confusion between loaded and locked states List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e900898601b4937176222a3642c7d2db38a11712 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e900898601b4937176222a3642c7d2db38a11712 commit e900898601b4937176222a3642c7d2db38a11712 Author: Stephane Rochoy AuthorDate: 2021-09-23 08:53:56 +0000 Commit: Gordon Bergling CommitDate: 2023-04-14 05:14:07 +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 (cherry picked from commit 492bf4fdad4dbb96b82d88e12918e61042f71661) --- 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;