From owner-dev-commits-src-main@freebsd.org Thu Jul 29 09:05:37 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
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 B5ADA66FC2B;
Thu, 29 Jul 2021 09:05: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 4Gb4PY4l5dz3nSx;
Thu, 29 Jul 2021 09:05: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 8A9076E4B;
Thu, 29 Jul 2021 09:05: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 16T95b9n002806;
Thu, 29 Jul 2021 09:05:37 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16T95bfd002805;
Thu, 29 Jul 2021 09:05:37 GMT (envelope-from git)
Date: Thu, 29 Jul 2021 09:05:37 GMT
Message-Id: <202107290905.16T95bfd002805@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Wojciech Macek <wma@FreeBSD.org>
Subject: git: fe8ce390b8bc - main - Fix mac_veriexec version mismatch
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: fe8ce390b8bcf304a9956b0f7ca8421868c22492
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
<dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jul 2021 09:05:37 -0000
The branch main has been updated by wma:
URL: https://cgit.FreeBSD.org/src/commit/?id=fe8ce390b8bcf304a9956b0f7ca8421868c22492
commit fe8ce390b8bcf304a9956b0f7ca8421868c22492
Author: Wojciech Macek <wma@FreeBSD.org>
AuthorDate: 2021-07-29 09:02:43 +0000
Commit: Wojciech Macek <wma@FreeBSD.org>
CommitDate: 2021-07-29 09:05:13 +0000
Fix mac_veriexec version mismatch
mac_veriexec sets its version to 1, but the mac_veriexec_shaX modules which depend on it expect MAC_VERIEXEC_VERSION = 2.
Be consistent and use MAC_VERIEXEC_VERSION everywhere.
This unbreaks loading of mac_veriexec modules at boot time.
Authored by: Kornel Duleba <mindal@semihalf.com>
Obtained from: Semihalf
Sponsored by: Stormshield
Differential Revision: https://reviews.freebsd.org/D31268
---
sys/dev/veriexec/verified_exec.c | 3 ++-
sys/security/mac_veriexec/mac_veriexec.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sys/dev/veriexec/verified_exec.c b/sys/dev/veriexec/verified_exec.c
index 3c72d30155dd..d6fabf825212 100644
--- a/sys/dev/veriexec/verified_exec.c
+++ b/sys/dev/veriexec/verified_exec.c
@@ -266,4 +266,5 @@ veriexec_drvinit(void *unused __unused)
}
SYSINIT(veriexec, SI_SUB_PSEUDO, SI_ORDER_ANY, veriexec_drvinit, NULL);
-MODULE_DEPEND(veriexec, mac_veriexec, 1, 1, 1);
+MODULE_DEPEND(veriexec, mac_veriexec, MAC_VERIEXEC_VERSION,
+ MAC_VERIEXEC_VERSION, MAC_VERIEXEC_VERSION);
diff --git a/sys/security/mac_veriexec/mac_veriexec.c b/sys/security/mac_veriexec/mac_veriexec.c
index ecaa8cc35e09..dc95890f613e 100644
--- a/sys/security/mac_veriexec/mac_veriexec.c
+++ b/sys/security/mac_veriexec/mac_veriexec.c
@@ -737,7 +737,7 @@ static struct mac_policy_ops mac_veriexec_ops =
MAC_POLICY_SET(&mac_veriexec_ops, mac_veriexec, MAC_VERIEXEC_FULLNAME,
MPC_LOADTIME_FLAG_NOTLATE, &mac_veriexec_slot);
-MODULE_VERSION(mac_veriexec, 1);
+MODULE_VERSION(mac_veriexec, MAC_VERIEXEC_VERSION);
static struct vnode *
mac_veriexec_bottom_vnode(struct vnode *vp)