From nobody Mon Apr 17 00:25:49 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 4Q07BQ0dm8z44xN4; Mon, 17 Apr 2023 00:25:50 +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 4Q07BP4WDlz4Qv5; Mon, 17 Apr 2023 00:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681691149; 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=LI03ZEFjy56V2pSBVaDEWDKxsGIX/r+rb9jUVXuIElg=; b=XWBPZu1b0SMLckBwuJonWG6yFWMzKgvAvH2/x/IfyKrzuDRcVVj4OdixhgzHv82nPsfbjk zCADx+sQG/k3GJGwZpARerwIi+XxQRYnAEjMgb51EgiFFcBXZilTKWroxKUJZvF2jHEfx8 KaIui5NmKDXSa/0B0Jm2cjhmEEgVECsDggileti8pveIjoGeRdHbDlT9UbcCtXMRa6L4o+ 8Cus8jNO46B+u3hWAbxaBi5rfRHGozbqNHSrISTdxp3j1WXKIaO+TTS1UDLn5F4GaFZoMi TV7spdVcsWCMaa6uzeweo7G14utTtPhu+uiCuG248vPSLhmvytSGGPlRIyS10w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681691149; 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=LI03ZEFjy56V2pSBVaDEWDKxsGIX/r+rb9jUVXuIElg=; b=vVSKIlTr8EftN/H62H29l2Eq3iwj/18aupWXvbrmCreqzxUr3NX8oMmW7/9xwOPU8vu1KB Xi5p30yaReEmYl+rLtsuv1fKxXD5xNFAccKlDjtZ6EwwQ94SwMCaxY0qepZqrh473lnMPq OAP7bJ6Dt+V+E82HWMXydInkT48sx1u+/iow+v6GH31kNEdvBxdUUirl0cWl5ZV6smOMxW iUEWm7rSxrEO/GeXMuxq0Uy74mv9bR2pbKNCaIP3LY1GgaG+9kQjYqwir0+Ao8eINZlWou V/3hvfAcwU10ld1FJZgs8OgZKybhXgIZcmfzRoDwFQtNJvU5BgIru7iodE2OHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681691149; a=rsa-sha256; cv=none; b=H09WqsekfgMgFmRIL0uozzg5GIzCZMJ5KbaXNRZfukMXnnLPhpmAuXgExtjrJRr7fs08Rp ZTYmZiyf5H4qPZsIpf2DHozbRq7tZAvwOZ+/OGIeSvf2yOcQ/x3ffVkpaMmhhWEbrIcPcw QEVdiExhkYlXmTllkExAJEpajSHdFStXd4Fxr90oY3jRfSO7lUMmqaAzs11PPFYZiWiTFh 75gRn0/R8IwZ0Ds0HgtaWpABrODAH5a58AxZxFyaCAhGxw3ZWKns9DDRks4KiUwNPRGt4b kRdDvdmJrXQVi+AbahUsz8v7TC7YXE3RQv37KNuVD1V3opaEhJ4wEx79LLNNew== 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 4Q07BP3bSKz17QQ; Mon, 17 Apr 2023 00:25:49 +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 33H0PnGP054505; Mon, 17 Apr 2023 00:25:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H0PnOg054504; Mon, 17 Apr 2023 00:25:49 GMT (envelope-from git) Date: Mon, 17 Apr 2023 00:25:49 GMT Message-Id: <202304170025.33H0PnOg054504@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 894bcc876da9 - main - sys/modules/Makefile: conditionally add MAC/veriexec modules 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: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 894bcc876da9390a02789dba31ab5ec5ec90bc33 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=894bcc876da9390a02789dba31ab5ec5ec90bc33 commit 894bcc876da9390a02789dba31ab5ec5ec90bc33 Author: Stephen J. Kiernan AuthorDate: 2023-04-16 23:36:07 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-04-17 00:24:54 +0000 sys/modules/Makefile: conditionally add MAC/veriexec modules Only build MAC/veriexec modules when MK_VERIEXEC is yes or we are building all modules. Add VERIEXEC knob to kernel __DEFAULT_NO_OPTIONS Reviewed by: sjg Obtained from: Juniper Networks, Inc. --- sys/conf/kern.opts.mk | 3 ++- sys/modules/Makefile | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 35ce97fae633..53992a31d07c 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -62,7 +62,8 @@ __DEFAULT_NO_OPTIONS = \ INIT_ALL_ZERO \ KERNEL_RETPOLINE \ RATELIMIT \ - REPRODUCIBLE_BUILD + REPRODUCIBLE_BUILD \ + VERIEXEC # Some options are totally broken on some architectures. We disable # them. If you need to enable them on an experimental basis, you diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 71e0be4cce2c..df47f5bf4652 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -588,12 +588,14 @@ _mac_priority= mac_priority _mac_seeotheruids= mac_seeotheruids _mac_stub= mac_stub _mac_test= mac_test +.if ${MK_VERIEXEC} != "no" || defined(ALL_MODULES) _mac_veriexec= mac_veriexec _mac_veriexec_sha1= mac_veriexec_sha1 _mac_veriexec_sha256= mac_veriexec_sha256 _mac_veriexec_sha384= mac_veriexec_sha384 _mac_veriexec_sha512= mac_veriexec_sha512 .endif +.endif .if ${MK_NETGRAPH} != "no" || defined(ALL_MODULES) _netgraph= netgraph