[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAHC9VhSu_tn6d2A4-CYQn_Kr4mdRKEBXLabbPkLZuwQcC2KhJA@mail.gmail.com>
Date: Mon, 21 Apr 2025 14:52:38 -0400
From: Paul Moore <paul@...l-moore.com>
To: James Bottomley <James.Bottomley@...senpartnership.com>
Cc: Blaise Boscaccy <bboscaccy@...ux.microsoft.com>, Jonathan Corbet <corbet@....net>,
David Howells <dhowells@...hat.com>, Herbert Xu <herbert@...dor.apana.org.au>,
"David S. Miller" <davem@...emloft.net>, James Morris <jmorris@...ei.org>,
"Serge E. Hallyn" <serge@...lyn.com>, Masahiro Yamada <masahiroy@...nel.org>,
Nathan Chancellor <nathan@...nel.org>, Nicolas Schier <nicolas@...sle.eu>, Shuah Khan <shuah@...nel.org>,
Mickaël Salaün <mic@...ikod.net>,
Günther Noack <gnoack@...gle.com>,
Nick Desaulniers <nick.desaulniers+lkml@...il.com>, Bill Wendling <morbo@...gle.com>,
Justin Stitt <justinstitt@...gle.com>, Jarkko Sakkinen <jarkko@...nel.org>,
Jan Stancek <jstancek@...hat.com>, Neal Gompa <neal@...pa.dev>, linux-doc@...r.kernel.org,
linux-kernel@...r.kernel.org, keyrings@...r.kernel.org,
linux-crypto@...r.kernel.org, linux-security-module@...r.kernel.org,
linux-kbuild@...r.kernel.org, linux-kselftest@...r.kernel.org,
bpf@...r.kernel.org, llvm@...ts.linux.dev, nkapron@...gle.com,
teknoraver@...a.com, roberto.sassu@...wei.com, xiyou.wangcong@...il.com
Subject: Re: [PATCH v2 security-next 1/4] security: Hornet LSM
On Sat, Apr 19, 2025 at 2:43 PM James Bottomley
<James.Bottomley@...senpartnership.com> wrote:
> On Fri, 2025-04-04 at 14:54 -0700, Blaise Boscaccy wrote:
> [...]
> > diff --git a/include/linux/kernel_read_file.h
> > b/include/linux/kernel_read_file.h
> > index 90451e2e12bd..7ed9337be542 100644
> > --- a/include/linux/kernel_read_file.h
> > +++ b/include/linux/kernel_read_file.h
> > @@ -14,6 +14,7 @@
> > id(KEXEC_INITRAMFS, kexec-initramfs) \
> > id(POLICY, security-policy) \
> > id(X509_CERTIFICATE, x509-certificate) \
> > + id(EBPF, ebpf) \
>
> This causes a BUILD_BUG_ON for me in security/selinux/hooks.c with
> CONFIG_SECURITY_SELINUX=y because READING_MAX_ID and LOADING_MAX_ID
> become 8.
>
> Below is what I had to do to get the compile to work.
That code was updated during the v6.15 merge window, depending on what
kernel sources Blaise is using for development it's possible he didn't
bump into this even if he was building with SELinux enabled.
Otherwise the changes below look reasonable to me.
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index e7a7dcab81db..9a7ed0b4b08d 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -4133,7 +4133,7 @@ static int selinux_kernel_read_file(struct file *file,
> {
> int rc = 0;
>
> - BUILD_BUG_ON_MSG(READING_MAX_ID > 7,
> + BUILD_BUG_ON_MSG(READING_MAX_ID > 8,
> "New kernel_read_file_id introduced; update SELinux!");
>
> switch (id) {
> @@ -4158,6 +4158,10 @@ static int selinux_kernel_read_file(struct file *file,
> rc = selinux_kernel_load_from_file(file,
> SYSTEM__X509_CERTIFICATE_LOAD);
> break;
> + case READING_EBPF:
> + rc = selinux_kernel_load_from_file(file,
> + SYSTEM__EBPF_LOAD);
> + break;
> default:
> break;
> }
> @@ -4169,7 +4173,7 @@ static int selinux_kernel_load_data(enum kernel_load_data_id id, bool contents)
> {
> int rc = 0;
>
> - BUILD_BUG_ON_MSG(LOADING_MAX_ID > 7,
> + BUILD_BUG_ON_MSG(LOADING_MAX_ID > 8,
> "New kernel_load_data_id introduced; update SELinux!");
>
> switch (id) {
> @@ -4195,6 +4199,10 @@ static int selinux_kernel_load_data(enum kernel_load_data_id id, bool contents)
> rc = selinux_kernel_load_from_file(NULL,
> SYSTEM__X509_CERTIFICATE_LOAD);
> break;
> + case LOADING_EBPF:
> + rc = selinux_kernel_load_from_file(NULL,
> + SYSTEM__EBPF_LOAD);
> + break;
> default:
> break;
> }
> diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h
> index 04a9b480885e..671db23451df 100644
> --- a/security/selinux/include/classmap.h
> +++ b/security/selinux/include/classmap.h
> @@ -65,7 +65,7 @@ const struct security_class_mapping secclass_map[] = {
> { "ipc_info", "syslog_read", "syslog_mod", "syslog_console",
> "module_request", "module_load", "firmware_load",
> "kexec_image_load", "kexec_initramfs_load", "policy_load",
> - "x509_certificate_load", NULL } },
> + "x509_certificate_load", "ebpf_load", NULL } },
> { "capability", { COMMON_CAP_PERMS, NULL } },
> { "filesystem",
> { "mount", "remount", "unmount", "getattr", "relabelfrom",
>
--
paul-moore.com
Powered by blists - more mailing lists