[PATCH v8 12/19] userns: Add pointer to ima_namespace to user_namespace
From: Stefan Berger <hidden>
Date: 2022-01-04 17:05:50
Also in:
linux-integrity, lkml
Subsystem:
extended verification module (evm), integrity measurement architecture (ima), security subsystem, the rest · Maintainers:
Mimi Zohar, Roberto Sassu, Dmitry Kasatkin, Paul Moore, James Morris, "Serge E. Hallyn", Linus Torvalds
From: Stefan Berger <stefanb@linux.ibm.com> Add a pointer to ima_namespace to the user_namespace and initialize the init_user_ns with a pointer to init_ima_ns. Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> --- include/linux/ima.h | 2 ++ include/linux/user_namespace.h | 4 ++++ kernel/user.c | 4 ++++ security/integrity/ima/ima.h | 8 ++++++++ 4 files changed, 18 insertions(+)
diff --git a/include/linux/ima.h b/include/linux/ima.h
index fcee2a51bb87..e1d65162d1fb 100644
--- a/include/linux/ima.h
+++ b/include/linux/ima.h@@ -14,6 +14,8 @@ #include <crypto/hash_info.h> struct linux_binprm; +extern struct ima_namespace init_ima_ns; + #ifdef CONFIG_IMA extern enum hash_algo ima_get_current_hash_algo(void); extern int ima_bprm_check(struct linux_binprm *bprm);
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index 33a4240e6a6f..019e8cf7b633 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h@@ -36,6 +36,7 @@ struct uid_gid_map { /* 64 bytes -- 1 cache line */ #define USERNS_INIT_FLAGS USERNS_SETGROUPS_ALLOWED struct ucounts; +struct ima_namespace; enum ucount_type { UCOUNT_USER_NAMESPACES,
@@ -99,6 +100,9 @@ struct user_namespace { #endif struct ucounts *ucounts; long ucount_max[UCOUNT_COUNTS]; +#ifdef CONFIG_IMA_NS + struct ima_namespace *ima_ns; +#endif } __randomize_layout; struct ucounts {
diff --git a/kernel/user.c b/kernel/user.c
index e2cf8c22b539..e5d1f4b9b8ba 100644
--- a/kernel/user.c
+++ b/kernel/user.c@@ -19,6 +19,7 @@ #include <linux/export.h> #include <linux/user_namespace.h> #include <linux/proc_ns.h> +#include <linux/ima.h> /* * userns count is 1 for root user, 1 for init_uts_ns,
@@ -67,6 +68,9 @@ struct user_namespace init_user_ns = { .keyring_name_list = LIST_HEAD_INIT(init_user_ns.keyring_name_list), .keyring_sem = __RWSEM_INITIALIZER(init_user_ns.keyring_sem), #endif +#ifdef CONFIG_IMA_NS + .ima_ns = &init_ima_ns, +#endif }; EXPORT_SYMBOL_GPL(init_user_ns);
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index 1c1e859721ee..f63c6f22b853 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h@@ -490,6 +490,14 @@ struct user_namespace *ima_user_ns_from_file(const struct file *filp) return file_inode(filp)->i_sb->s_user_ns; } +static inline struct ima_namespace +*ima_ns_from_user_ns(struct user_namespace *user_ns) +{ + if (user_ns == &init_user_ns) + return &init_ima_ns; + return NULL; +} + static inline struct ima_namespace *get_current_ns(void) { return &init_ima_ns;
--
2.31.1