From: Stefan Berger <stefanb@xxxxxxxxxxxxx>
Introduce securityfs file 'active' that allows a user to activate an IMA
namespace by writing a "1" (precisely a '1\0' or '1\n') to it. When
reading from the file, it shows either '0' or '1'.
Also, introduce ns_is_active() to be used in those places where the
ima_namespace pointer may either be NULL or where the active field may not
have been set to '1', yet. An inactive IMA namespace should never be
accessed since it has not been initialized, yet.
Set the init_ima_ns's active field to '1' since it is considered active
right from the beginning.
The rationale for introducing a file to activate an IMA namespace is that
subsequent support for IMA-measurement and IMA-appraisal will add
configuration files for selecting for example the template that an IMA
namespace is supposed to use for logging measurements, which will add
an IMA namespace configuration stage (using securityfs files) before its
activation.
Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxxxxx>
---
security/integrity/ima/ima.h | 7 +++
security/integrity/ima/ima_fs.c | 59 ++++++++++++++++++++++++
security/integrity/ima/ima_init_ima_ns.c | 1 +
security/integrity/ima/ima_main.c | 2 +-
4 files changed, 68 insertions(+), 1 deletion(-)
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index a52b388b4157..cf2f63bb5bdf 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -123,6 +123,8 @@ struct ima_h_table {
};
struct ima_namespace {
+ atomic_t active; /* whether namespace is active */
+
struct rb_root ns_status_tree;
rwlock_t ns_tree_lock;
struct kmem_cache *ns_status_cache;
@@ -154,6 +156,11 @@ struct ima_namespace {
} __randomize_layout;
extern struct ima_namespace init_ima_ns;
+static inline bool ns_is_active(struct ima_namespace *ns)
+{
+ return (ns && atomic_read(&ns->active));
+}
+
extern const int read_idmap[];
#ifdef CONFIG_HAVE_IMA_KEXEC
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index 5dd0e759a470..79a786db79db 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -451,6 +451,62 @@ static const struct file_operations ima_measure_policy_ops = {
.llseek = generic_file_llseek,
};
+static ssize_t ima_show_active(struct file *filp,
+ char __user *buf,
+ size_t count, loff_t *ppos)
+{
+ struct ima_namespace *ns = &init_ima_ns;
+ char tmpbuf[2];
+ ssize_t len;
+
+ len = scnprintf(tmpbuf, sizeof(tmpbuf),
+ "%d\n", atomic_read(&ns->active));
+ return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
+}
+
+static ssize_t ima_write_active(struct file *filp,
+ const char __user *buf,
+ size_t count, loff_t *ppos)
+{
+ struct ima_namespace *ns = &init_ima_ns;
+ unsigned int active;
+ char tmpbuf[3];
+ ssize_t ret;
+
+ if (ns_is_active(ns))
+ return -EBUSY;
+
+ ret = simple_write_to_buffer(tmpbuf, sizeof(tmpbuf) - 1, ppos,
+ buf, count);
+ if (ret < 0)
+ return ret;
+ tmpbuf[ret] = 0;
+
+ if (!kstrtouint(tmpbuf, 10, &active) && active == 1)
+ atomic_set(&ns->active, 1);
+
+ return count;
+}
+
+static const struct file_operations ima_active_ops = {
+ .read = ima_show_active,
+ .write = ima_write_active,
+};
+
+static int ima_fs_add_ns_files(struct dentry *ima_dir)
+{
+ struct dentry *active;
+
+ active =
+ securityfs_create_file("active",
+ S_IRUSR | S_IWUSR | S_IRGRP, ima_dir, NULL,
+ &ima_active_ops);
+ if (IS_ERR(active))
+ return PTR_ERR(active);
+
+ return 0;
+}
+
int ima_fs_ns_init(struct user_namespace *user_ns, struct dentry *root)
{
struct ima_namespace *ns = ima_ns_from_user_ns(user_ns);
@@ -516,6 +572,9 @@ int ima_fs_ns_init(struct user_namespace *user_ns, struct dentry *root)
goto out;
}
+ if (ns != &init_ima_ns && ima_fs_add_ns_files(ima_dir))
+ goto out;
+
return 0;
out:
securityfs_remove(ns->ima_policy);
diff --git a/security/integrity/ima/ima_init_ima_ns.c b/security/integrity/ima/ima_init_ima_ns.c
index d4ddfd1de60b..39ee0c2477a6 100644
--- a/security/integrity/ima/ima_init_ima_ns.c
+++ b/security/integrity/ima/ima_init_ima_ns.c
@@ -58,5 +58,6 @@ struct ima_namespace init_ima_ns = {
.ima_lsm_policy_notifier = {
.notifier_call = ima_lsm_policy_change,
},
+ .active = ATOMIC_INIT(1),
};
EXPORT_SYMBOL(init_ima_ns);
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 8018e9aaad32..059917182960 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -441,7 +441,7 @@ static int process_measurement(struct user_namespace *user_ns,
while (user_ns) {
ns = ima_ns_from_user_ns(user_ns);
- if (ns) {
+ if (ns_is_active(ns)) {
int rc;
rc = __process_measurement(ns, file, cred, secid, buf,
--
2.31.1
