From: Stefan Berger <stefanb@linux.ibm.com>
To: linux-integrity@vger.kernel.org
Cc: zohar@linux.ibm.com, serge@hallyn.com, brauner@kernel.org,
containers@lists.linux.dev, dmitry.kasatkin@gmail.com,
ebiederm@xmission.com, krzysztof.struczynski@huawei.com,
roberto.sassu@huawei.com, mpeters@redhat.com, lhinds@redhat.com,
lsturman@redhat.com, puiterwi@redhat.com, jejb@linux.ibm.com,
jamjoom@us.ibm.com, linux-kernel@vger.kernel.org,
paul@paul-moore.com, rgb@redhat.com,
linux-security-module@vger.kernel.org, jmorris@namei.org,
jpenumak@redhat.com, Stefan Berger <stefanb@linux.ibm.com>
Subject: [PATCH v14 13/26] userns: Add pointer to ima_namespace to user_namespace
Date: Thu, 15 Sep 2022 15:32:08 -0400 [thread overview]
Message-ID: <20220915193221.1728029-14-stefanb@linux.ibm.com> (raw)
In-Reply-To: <20220915193221.1728029-1-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. We need a pointer from
the user namespace to its associated IMA namespace since IMA namespaces
are piggybacking on user namespaces.
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Acked-by: Christian Brauner <brauner@kernel.org>
Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
---
v13:
- Added comment to ima_namespace pointer in user_namespace structure
following Serge's suggestion
v11:
- Added lost A-b from Christian back
- Added sentence to patch description explaining why we need the pointer
v9:
- Deferred implementation of ima_ns_from_user_ns() to later patch
---
include/linux/ima.h | 2 ++
include/linux/user_namespace.h | 9 +++++++++
kernel/user.c | 4 ++++
3 files changed, 15 insertions(+)
diff --git a/include/linux/ima.h b/include/linux/ima.h
index 81708ca0ebc7..e0a17fda456a 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..8cb3489c988d 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,14 @@ struct user_namespace {
#endif
struct ucounts *ucounts;
long ucount_max[UCOUNT_COUNTS];
+#ifdef CONFIG_IMA_NS
+ /* Pointer to ima_ns which this user_ns created. Can be null. IMA's
+ * file access checks will walk the userns->parent chain and check
+ * against all active ima_ns's. Note that when the user_ns is
+ * freed, the ima_ns is guaranteed to be free-able.
+ */
+ 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);
--
2.36.1
next prev parent reply other threads:[~2022-09-15 19:33 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-15 19:31 [PATCH v14 00/26] ima: Namespace IMA with audit support in IMA-ns Stefan Berger
2022-09-15 19:31 ` [PATCH v14 01/26] securityfs: rework dentry creation Stefan Berger
2022-09-15 19:31 ` [PATCH v14 02/26] securityfs: Extend securityfs with namespacing support Stefan Berger
2022-09-15 19:31 ` [PATCH v14 03/26] ima: Define ima_namespace struct and start moving variables into it Stefan Berger
2022-09-15 19:31 ` [PATCH v14 04/26] ima: Move arch_policy_entry into ima_namespace Stefan Berger
2022-09-15 19:32 ` [PATCH v14 05/26] ima: Move ima_htable " Stefan Berger
2022-09-15 19:32 ` [PATCH v14 06/26] ima: Move measurement list related variables " Stefan Berger
2022-09-15 19:32 ` [PATCH v14 07/26] ima: Move some IMA policy and filesystem " Stefan Berger
2022-09-15 19:32 ` [PATCH v14 08/26] ima: Move IMA securityfs files into ima_namespace or onto stack Stefan Berger
2022-09-15 19:32 ` [PATCH v14 09/26] ima: Move ima_lsm_policy_notifier into ima_namespace Stefan Berger
2022-09-15 19:32 ` [PATCH v14 10/26] ima: Switch to lazy lsm policy updates for better performance Stefan Berger
2022-09-15 19:32 ` [PATCH v14 11/26] ima: Define mac_admin_ns_capable() as a wrapper for ns_capable() Stefan Berger
2022-09-15 19:32 ` [PATCH v14 12/26] ima: Only accept AUDIT rules for non-init_ima_ns namespaces for now Stefan Berger
2022-09-15 19:32 ` Stefan Berger [this message]
2022-09-15 19:32 ` [PATCH v14 14/26] ima: Implement hierarchical processing of file accesses Stefan Berger
2022-09-15 19:32 ` [PATCH v14 15/26] ima: Implement ima_free_policy_rules() for freeing of an ima_namespace Stefan Berger
2022-09-15 19:32 ` [PATCH v14 16/26] ima: Add functions for creating and " Stefan Berger
2022-09-15 19:32 ` [PATCH v14 17/26] integrity/ima: Define ns_status for storing namespaced iint data Stefan Berger
2022-09-15 19:32 ` [PATCH v14 18/26] integrity: Add optional callback function to integrity_inode_free() Stefan Berger
2022-09-15 19:32 ` [PATCH v14 19/26] ima: Namespace audit status flags Stefan Berger
2022-09-15 19:32 ` [PATCH v14 20/26] ima: Remove unused iints from the integrity_iint_cache Stefan Berger
2022-09-15 19:32 ` [PATCH v14 21/26] ima: Setup securityfs for IMA namespace Stefan Berger
2022-09-15 19:32 ` [PATCH v14 22/26] ima: Introduce securityfs file to activate an " Stefan Berger
2022-09-15 19:32 ` [PATCH v14 23/26] ima: Show owning user namespace's uid and gid when displaying policy Stefan Berger
2022-09-15 19:32 ` [PATCH v14 24/26] ima: Limit number of policy rules in non-init_ima_ns Stefan Berger
2022-09-15 19:32 ` [PATCH v14 25/26] ima: Restrict informational audit messages to init_ima_ns Stefan Berger
2022-09-15 19:32 ` [PATCH v14 26/26] ima: Enable IMA namespaces Stefan Berger
2022-09-16 0:56 ` [PATCH v14 00/26] ima: Namespace IMA with audit support in IMA-ns Casey Schaufler
2022-09-16 10:54 ` Stefan Berger
2022-09-16 13:20 ` Stefan Berger
2022-09-16 17:05 ` Casey Schaufler
2022-09-20 20:08 ` Stefan Berger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220915193221.1728029-14-stefanb@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=brauner@kernel.org \
--cc=containers@lists.linux.dev \
--cc=dmitry.kasatkin@gmail.com \
--cc=ebiederm@xmission.com \
--cc=jamjoom@us.ibm.com \
--cc=jejb@linux.ibm.com \
--cc=jmorris@namei.org \
--cc=jpenumak@redhat.com \
--cc=krzysztof.struczynski@huawei.com \
--cc=lhinds@redhat.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=lsturman@redhat.com \
--cc=mpeters@redhat.com \
--cc=paul@paul-moore.com \
--cc=puiterwi@redhat.com \
--cc=rgb@redhat.com \
--cc=roberto.sassu@huawei.com \
--cc=serge@hallyn.com \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).