Date: Thu, 29 Jul 2021 09:05:37 GMT From: Wojciech Macek <wma@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: fe8ce390b8bc - main - Fix mac_veriexec version mismatch Message-ID: <202107290905.16T95bfd002805@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107290905.16T95bfd002805>