From owner-dev-commits-src-main@freebsd.org Fri Jul 30 04:01:32 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 D68F465FC02; Fri, 30 Jul 2021 04:01:32 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GbYcD5Kvsz3PQy; Fri, 30 Jul 2021 04:01:32 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mail-pj1-x1033.google.com with SMTP id l19so13321075pjz.0; Thu, 29 Jul 2021 21:01:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:message-id:date:mime-version:user-agent:reply-to:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=x6WUr7L5tnOHdXrKvg97J2W2UVb43BfJ2gc5jcpEpMA=; b=i6BCWbldH0YWHUNSqV7o3JHCD+lNlUlsrs3kUEWMR/Mg6Lj+gFpRwVjWLz4KDWaX6r IQOmX+W7vbM3NqsefpsKh/kqDIqBQu7E/yx58dKLRvdaI/RMUCoDEGwE9jocjT1HWPLQ 65j0auH6OWXhqiPKo4Vp6qt1gmrjFBWvfP7EGE+YfHMS6kd6aGjh4ZsQbhVYLSuhZiF5 +gmWjwBWTaS+ydYWrYRgwjeXKYc8hBude19fZXVqvcDRoAXvAzFgcgVFpVNWIuWwvBVI tK1qboN/ER9v/2tPmSDr5Z/lnbRDmzrkcOouxqpVW/33QNkcQxqHvfPfmHjJ/LWguoUo qz9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:message-id:date:mime-version:user-agent :reply-to:subject:content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=x6WUr7L5tnOHdXrKvg97J2W2UVb43BfJ2gc5jcpEpMA=; b=PrRJnmA/MCZno9A+PagzOva1K7waghUdC14xLtKKuHWcNfJKGajE6S2laIsWSiTHKi QAOzdxoWZQwj5lfUi40H1AuOFzBBEH9Mg6TZYGVj2Yz4Kcxk9feb8Zb4Lp6qS44/9ddg VcpqkP5/q8X6IfH9xs2OJiWDjCUi1xrQF7jkRrFDC9h0q2ZzfZ0QOUGWMyt5WUD1HwpV iZukCcENVs1lxkUA3dHqPHxalJQnUnfCmTfN5LjQqkD4JN2hrsu2GpnkaO9vdKHLOGcZ uvrbKwzBVCVVDLEmp4yB2I/FDGgAcvt9uRPHh7r2lOzG0Xx/cDFFb5mmDadfSgH3Rkxs W//A== X-Gm-Message-State: AOAM533335Ta5Kc+9h5oinlCYUPrxvs7eC/y5rLpxpcYDS7ZrZwogQwP qk/UpHtDFkI/m4J8pUU1dv9A9tT8eNZ7CQ== X-Google-Smtp-Source: ABdhPJw5C7FpiXbLKzHNrOSIxx7QUnfxeDVBWPhraTYy4ay796Yytfy1v/jKxObWz+735vPUeexQQg== X-Received: by 2002:a17:90a:ba09:: with SMTP id s9mr879962pjr.126.1627617691799; Thu, 29 Jul 2021 21:01:31 -0700 (PDT) Received: from ?IPV6:2403:5800:7500:3601:a18a:8235:5cb4:170b? (2403-5800-7500-3601-a18a-8235-5cb4-170b.ip6.aussiebb.net. [2403:5800:7500:3601:a18a:8235:5cb4:170b]) by smtp.gmail.com with UTF8SMTPSA id x14sm393604pfq.143.2021.07.29.21.01.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 29 Jul 2021 21:01:31 -0700 (PDT) Sender: Kubilay Kocak Message-ID: <7a677c67-ea2d-aaf5-6254-334bfe93f6b3@FreeBSD.org> Date: Fri, 30 Jul 2021 14:01:24 +1000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:92.0) Gecko/20100101 Thunderbird/92.0a1 Reply-To: koobs@FreeBSD.org Subject: Re: git: fe8ce390b8bc - main - Fix mac_veriexec version mismatch Content-Language: en-US To: Wojciech Macek , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202107290905.16T95bfd002805@gitrepo.freebsd.org> From: Kubilay Kocak In-Reply-To: <202107290905.16T95bfd002805@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4GbYcD5Kvsz3PQy X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; TAGGED_FROM(0.00)[]; REPLY(-4.00)[] 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: Fri, 30 Jul 2021 04:01:32 -0000 On 29/07/2021 7:05 pm, Wojciech Macek wrote: > The branch main has been updated by wma: > > URL: https://cgit.FreeBSD.org/src/commit/?id=fe8ce390b8bcf304a9956b0f7ca8421868c22492 > > commit fe8ce390b8bcf304a9956b0f7ca8421868c22492 > Author: Wojciech Macek > AuthorDate: 2021-07-29 09:02:43 +0000 > Commit: Wojciech Macek > 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 > 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) > _______________________________________________ > dev-commits-src-main@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main > To unsubscribe, send any mail to "dev-commits-src-main-unsubscribe@freebsd.org" > Any chance of getting this available (not enabled) in default (GENERIC) builds? Has come up a few times in the community