Setup securityfs_ns with symlinks, directories, and files for IMA
namespacing support. The same directory structure that IMA uses on the
host is also created for the namespacing case.
Increment the user namespace's refcount_teardown value by '1' once
securityfs_ns has been successfully setup since the initialization of the
filesystem causes an additional reference to the user namespace to be
taken. The early teardown function will delete the file system and release
the additional reference.
The securityfs_ns file and directory ownerships cannot be set when the
filesystem is setup since at this point the user namespace has not been
configured yet by the user and therefore the ownership mappings are not
available, yet. Therefore, adjust the file and directory ownerships when
an inode's function for determining the permissions of a file or directory
is accessed.
This filesystem can now be mounted as follows:
mount -t securityfs_ns /sys/kernel/security/ /sys/kernel/security/
The following directories, symlinks, and files are then available.
$ ls -l sys/kernel/security/
total 0
lr--r--r--. 1 nobody nobody 0 Nov 27 06:44 ima -> integrity/ima
drwxr-xr-x. 3 nobody nobody 0 Nov 27 06:44 integrity
$ ls -l sys/kernel/security/ima/
total 0
-r--r-----. 1 root root 0 Nov 27 06:44 ascii_runtime_measurements
-r--r-----. 1 root root 0 Nov 27 06:44 binary_runtime_measurements
-rw-------. 1 root root 0 Nov 27 06:44 policy
-r--r-----. 1 root root 0 Nov 27 06:44 runtime_measurements_count
-r--r-----. 1 root root 0 Nov 27 06:44 violations
Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxxxxx>
---
include/linux/ima.h | 17 +++
security/integrity/ima/ima.h | 2 +
security/integrity/ima/ima_fs.c | 178 ++++++++++++++++++++++-
security/integrity/ima/ima_init_ima_ns.c | 6 +-
security/integrity/ima/ima_ns.c | 4 +-
5 files changed, 203 insertions(+), 4 deletions(-)
diff --git a/include/linux/ima.h b/include/linux/ima.h
index fe08919df326..a2c5e516f706 100644
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
@@ -221,6 +221,18 @@ struct ima_h_table {
struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
};
+enum {
+ IMAFS_DENTRY_INTEGRITY_DIR = 0,
+ IMAFS_DENTRY_DIR,
+ IMAFS_DENTRY_SYMLINK,
+ IMAFS_DENTRY_BINARY_RUNTIME_MEASUREMENTS,
+ IMAFS_DENTRY_ASCII_RUNTIME_MEASUREMENTS,
+ IMAFS_DENTRY_RUNTIME_MEASUREMENTS_COUNT,
+ IMAFS_DENTRY_VIOLATIONS,
+ IMAFS_DENTRY_IMA_POLICY,
+ IMAFS_DENTRY_LAST
+};
+
struct ima_namespace {
struct kref kref;
struct user_namespace *user_ns;
@@ -267,6 +279,11 @@ struct ima_namespace {
struct mutex ima_write_mutex;
unsigned long ima_fs_flags;
int valid_policy;
+
+ struct dentry *dentry[IMAFS_DENTRY_LAST];
+ struct vfsmount *mount;
+ int mount_count;
+ bool file_ownership_fixes_done;
};
extern struct ima_namespace init_ima_ns;
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index bb9763cd5fb1..9bcd71bb716c 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -139,6 +139,8 @@ struct ns_status {
/* Internal IMA function definitions */
int ima_init(void);
int ima_fs_init(void);
+int ima_fs_ns_init(struct ima_namespace *ns);
+void ima_fs_ns_free(struct ima_namespace *ns);
int ima_add_template_entry(struct ima_namespace *ns,
struct ima_template_entry *entry, int violation,
const char *op, struct inode *inode,
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index 6766bb8262f2..9a14be520268 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -22,6 +22,7 @@
#include <linux/parser.h>
#include <linux/vmalloc.h>
#include <linux/ima.h>
+#include <linux/namei.h>
#include "ima.h"
@@ -436,8 +437,13 @@ static int ima_release_policy(struct inode *inode, struct file *file)
ima_update_policy(ns);
#if !defined(CONFIG_IMA_WRITE_POLICY) && !defined(CONFIG_IMA_READ_POLICY)
- securityfs_remove(ima_policy);
- ima_policy = NULL;
+ if (ns == &init_ima_ns) {
+ securityfs_remove(ima_policy);
+ ima_policy = NULL;
+ } else {
+ securityfs_ns_remove(ns->dentry[IMAFS_DENTRY_POLICY]);
+ ns->dentry[IMAFS_DENTRY_POLICY] = NULL;
+ }
#elif defined(CONFIG_IMA_WRITE_POLICY)
clear_bit(IMA_FS_BUSY, &ns->ima_fs_flags);
#elif defined(CONFIG_IMA_READ_POLICY)
@@ -509,3 +515,171 @@ int __init ima_fs_init(void)
securityfs_remove(ima_policy);
return -1;
}
+
+/*
+ * Fix the ownership (uid/gid) of the dentry's that couldn't be set at the
+ * time of their creation because the user namespace wasn't configured, yet.
+ */
+static void ima_fs_ns_fixup_uid_gid(struct ima_namespace *ns)
+{
+ struct inode *inode;
+ size_t i;
+
+ if (ns->file_ownership_fixes_done ||
+ ns->user_ns->uid_map.nr_extents == 0)
+ return;
+
+ ns->file_ownership_fixes_done = true;
+ for (i = 0; i < IMAFS_DENTRY_LAST; i++) {
+ if (!ns->dentry[i])
+ continue;
+ inode = ns->dentry[i]->d_inode;
+ inode->i_uid = make_kuid(ns->user_ns, 0);
+ inode->i_gid = make_kgid(ns->user_ns, 0);
+ }
+}
+
+/* Fix the permissions when a file is opened */
+int ima_fs_ns_permission(struct user_namespace *mnt_userns, struct inode *inode,
+ int mask)
+{
+ ima_fs_ns_fixup_uid_gid(get_current_ns());
+ return generic_permission(mnt_userns, inode, mask);
+}
+
+const struct inode_operations ima_fs_ns_inode_operations = {
+ .lookup = simple_lookup,
+ .permission = ima_fs_ns_permission,
+};
+
+int ima_fs_ns_init(struct ima_namespace *ns)
+{
+ struct dentry *parent;
+
+ ns->mount = securityfs_ns_create_mount(ns->user_ns);
+ if (IS_ERR(ns->mount)) {
+ ns->mount = NULL;
+ return -1;
+ }
+ ns->mount_count += 1;
+
+ ns->dentry[IMAFS_DENTRY_INTEGRITY_DIR] =
+ securityfs_ns_create_dir("integrity", NULL,
+ &ima_fs_ns_inode_operations,
+ &ns->mount, &ns->mount_count);
+ if (IS_ERR(ns->dentry[IMAFS_DENTRY_INTEGRITY_DIR])) {
+ ns->dentry[IMAFS_DENTRY_INTEGRITY_DIR] = NULL;
+ goto out;
+ }
+
+ ns->dentry[IMAFS_DENTRY_DIR] =
+ securityfs_ns_create_dir("ima", ns->dentry[IMAFS_DENTRY_INTEGRITY_DIR],
+ &ima_fs_ns_inode_operations,
+ &ns->mount, &ns->mount_count);
+ if (IS_ERR(ns->dentry[IMAFS_DENTRY_DIR])) {
+ ns->dentry[IMAFS_DENTRY_DIR] = NULL;
+ goto out;
+ }
+
+ ns->dentry[IMAFS_DENTRY_SYMLINK] =
+ securityfs_ns_create_symlink("ima", NULL, "integrity/ima", NULL,
+ &ns->mount, &ns->mount_count);
+ if (IS_ERR(ns->dentry[IMAFS_DENTRY_SYMLINK])) {
+ ns->dentry[IMAFS_DENTRY_SYMLINK] = NULL;
+ goto out;
+ }
+
+ parent = ns->dentry[IMAFS_DENTRY_DIR];
+ ns->dentry[IMAFS_DENTRY_BINARY_RUNTIME_MEASUREMENTS] =
+ securityfs_ns_create_file("binary_runtime_measurements",
+ S_IRUSR | S_IRGRP, parent, NULL,
+ &ima_measurements_ops,
+ &ima_fs_ns_inode_operations,
+ &ns->mount, &ns->mount_count);
+ if (IS_ERR(ns->dentry[IMAFS_DENTRY_BINARY_RUNTIME_MEASUREMENTS])) {
+ ns->dentry[IMAFS_DENTRY_BINARY_RUNTIME_MEASUREMENTS] = NULL;
+ goto out;
+ }
+
+ ns->dentry[IMAFS_DENTRY_ASCII_RUNTIME_MEASUREMENTS] =
+ securityfs_ns_create_file("ascii_runtime_measurements",
+ S_IRUSR | S_IRGRP, parent, NULL,
+ &ima_ascii_measurements_ops,
+ &ima_fs_ns_inode_operations,
+ &ns->mount, &ns->mount_count);
+ if (IS_ERR(ns->dentry[IMAFS_DENTRY_ASCII_RUNTIME_MEASUREMENTS])) {
+ ns->dentry[IMAFS_DENTRY_ASCII_RUNTIME_MEASUREMENTS] = NULL;
+ goto out;
+ }
+
+ ns->dentry[IMAFS_DENTRY_RUNTIME_MEASUREMENTS_COUNT] =
+ securityfs_ns_create_file("runtime_measurements_count",
+ S_IRUSR | S_IRGRP, parent, NULL,
+ &ima_measurements_count_ops,
+ &ima_fs_ns_inode_operations,
+ &ns->mount, &ns->mount_count);
+ if (IS_ERR(ns->dentry[IMAFS_DENTRY_RUNTIME_MEASUREMENTS_COUNT])) {
+ ns->dentry[IMAFS_DENTRY_RUNTIME_MEASUREMENTS_COUNT] = NULL;
+ goto out;
+ }
+
+ ns->dentry[IMAFS_DENTRY_VIOLATIONS] =
+ securityfs_ns_create_file("violations", S_IRUSR | S_IRGRP,
+ parent, NULL, &ima_htable_violations_ops,
+ &ima_fs_ns_inode_operations,
+ &ns->mount, &ns->mount_count);
+ if (IS_ERR(ns->dentry[IMAFS_DENTRY_VIOLATIONS])) {
+ ns->dentry[IMAFS_DENTRY_VIOLATIONS] = NULL;
+ goto out;
+ }
+
+ ns->dentry[IMAFS_DENTRY_IMA_POLICY] =
+ securityfs_ns_create_file("policy", POLICY_FILE_FLAGS,
+ parent, NULL,
+ &ima_measure_policy_ops,
+ &ima_fs_ns_inode_operations,
+ &ns->mount, &ns->mount_count);
+ if (IS_ERR(ns->dentry[IMAFS_DENTRY_IMA_POLICY])) {
+ ns->dentry[IMAFS_DENTRY_IMA_POLICY] = NULL;
+ goto out;
+ }
+
+ /* Adjust the trigger for user namespace's early teardown of dependent
+ * namespaces. Due to the filesystem there's an additional reference
+ * to the user namespace.
+ */
+ ns->user_ns->refcount_teardown += 1;
+
+ return 0;
+
+out:
+ ima_fs_ns_free(ns);
+
+ return -1;
+}
+
+void ima_fs_ns_free(struct ima_namespace *ns)
+{
+ size_t i;
+
+ for (i = 0; i < IMAFS_DENTRY_LAST; i++) {
+ switch (i) {
+ case IMAFS_DENTRY_DIR:
+ case IMAFS_DENTRY_INTEGRITY_DIR:
+ /* files first */
+ continue;
+ }
+ securityfs_ns_remove(ns->dentry[i], &ns->mount, &ns->mount_count);
+ ns->dentry[i] = NULL;
+ }
+ securityfs_ns_remove(ns->dentry[IMAFS_DENTRY_DIR], &ns->mount, &ns->mount_count);
+ ns->dentry[IMAFS_DENTRY_DIR] = NULL;
+ securityfs_ns_remove(ns->dentry[IMAFS_DENTRY_INTEGRITY_DIR], &ns->mount, &ns->mount_count);
+ ns->dentry[IMAFS_DENTRY_INTEGRITY_DIR] = NULL;
+
+ if (ns->mount) {
+ mntput(ns->mount);
+ ns->mount_count -= 1;
+ }
+ ns->mount = NULL;
+}
diff --git a/security/integrity/ima/ima_init_ima_ns.c b/security/integrity/ima/ima_init_ima_ns.c
index 22ff74e85a5f..86a89502c0c5 100644
--- a/security/integrity/ima/ima_init_ima_ns.c
+++ b/security/integrity/ima/ima_init_ima_ns.c
@@ -20,6 +20,8 @@
int ima_init_namespace(struct ima_namespace *ns)
{
+ int rc = 0;
+
ns->ns_status_tree = RB_ROOT;
rwlock_init(&ns->ns_status_lock);
ns->ns_status_cache = KMEM_CACHE(ns_status, SLAB_PANIC);
@@ -52,8 +54,10 @@ int ima_init_namespace(struct ima_namespace *ns)
mutex_init(&ns->ima_write_mutex);
ns->valid_policy = 1;
ns->ima_fs_flags = 0;
+ if (ns != &init_ima_ns)
+ rc = ima_fs_ns_init(ns);
- return 0;
+ return rc;
}
int __init ima_ns_init(void)
diff --git a/security/integrity/ima/ima_ns.c b/security/integrity/ima/ima_ns.c
index e7ad52b79f99..c687e840441a 100644
--- a/security/integrity/ima/ima_ns.c
+++ b/security/integrity/ima/ima_ns.c
@@ -67,7 +67,9 @@ struct ima_namespace *copy_ima_ns(struct ima_namespace *old_ns,
void ima_ns_userns_early_teardown(struct ima_namespace *ns)
{
-}
+ pr_debug("%s: ns=0x%lx\n", __func__, (unsigned long)ns);
+ ima_fs_ns_free(ns);
+};
EXPORT_SYMBOL(ima_ns_userns_early_teardown);
static void destroy_ima_ns(struct ima_namespace *ns)
--
2.31.1
