| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20180725233200.761-2-erichte@linux.vnet.ibm.com>
Date: Wed, 25 Jul 2018 18:31:57 -0500
From: Eric Richter <erichte@...ux.vnet.ibm.com>
To: linux-integrity <linux-integrity@...r.kernel.org>
Cc: linux-security-module <linux-security-module@...r.kernel.org>,
linux-efi <linux-efi@...r.kernel.org>,
linux-kernel <linux-kernel@...r.kernel.org>,
David Howells <dhowells@...hat.com>,
Seth Forshee <seth.forshee@...onical.com>,
Justin Forbes <jforbes@...hat.com>,
Nayna Jain <nayna@...ux.vnet.ibm.com>,
Mimi Zohar <zohar@...ux.ibm.com>
Subject: [PATCH 1/4] ima: add support for arch specific policies
From: Nayna Jain <nayna@...ux.vnet.ibm.com>
Builtin IMA policies can be enabled on the boot command line, and
replaced with a custom policy, normally during early boot in the
initramfs. Build time IMA policy rules were recently added. These
rules are automatically enabled on boot and persist after loading a
custom policy.
There is a need for yet another type of policy, an architecture specific
policy, which is derived at runtime during kernel boot, based on the
runtime secure boot flags. Like the build time policy rules, these
rules persist after loading a custom policy.
This patch adds support for loading an architecture specific IMA
policy.
Signed-off-by: Nayna Jain <nayna@...ux.vnet.ibm.com>
- Defined function to convert the arch policy strings to an array of
ima_entry_rules. The memory can then be freed after loading a custom
policy.
- Rename ima_get_arch_policy to arch_get_ima_policy.
Signed-off-by: Mimi Zohar <zohar@...ux.ibm.com>
---
include/linux/ima.h | 5 ++
security/integrity/ima/ima_policy.c | 95 +++++++++++++++++++++++++++++++++++++
2 files changed, 100 insertions(+)
diff --git a/include/linux/ima.h b/include/linux/ima.h
index 84806b54b50..7fd272f0b1f 100644
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
@@ -30,6 +30,11 @@ extern void ima_post_path_mknod(struct dentry *dentry);
extern void ima_add_kexec_buffer(struct kimage *image);
#endif
+static inline const char * const *arch_get_ima_policy(void)
+{
+ return NULL;
+}
+
#else
static inline int ima_bprm_check(struct linux_binprm *bprm)
{
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index 8c9499867c9..b47db4d7fea 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -20,6 +20,7 @@
#include <linux/rculist.h>
#include <linux/genhd.h>
#include <linux/seq_file.h>
+#include <linux/ima.h>
#include "ima.h"
@@ -193,6 +194,10 @@ static struct ima_rule_entry secure_boot_rules[] __ro_after_init = {
.flags = IMA_FUNC | IMA_DIGSIG_REQUIRED},
};
+/* An array of architecture specific rules */
+struct ima_rule_entry **arch_policy_rules __ro_after_init;
+struct ima_rule_entry *arch_policy_entry __ro_after_init;
+
static LIST_HEAD(ima_default_rules);
static LIST_HEAD(ima_policy_rules);
static LIST_HEAD(ima_temp_rules);
@@ -473,6 +478,59 @@ static int ima_appraise_flag(enum ima_hooks func)
return 0;
}
+static int ima_parse_rule(char *rule, struct ima_rule_entry *entry);
+
+/*
+ * ima_init_arch_policy - convert arch policy strings to rules
+ *
+ * Return number of arch specific rules.
+ */
+static int __init ima_init_arch_policy(void)
+{
+ const char * const *arch_rules;
+ const char * const *rules;
+ int arch_entries = 0;
+ int i = 0;
+
+ arch_rules = arch_get_ima_policy();
+ if (!arch_rules) {
+ pr_info("No architecture policy rules.\n");
+ return arch_entries;
+ }
+
+ /* Get number of rules */
+ for (rules = arch_rules; *rules != NULL; rules++)
+ arch_entries++;
+
+ arch_policy_rules = kcalloc(arch_entries + 1,
+ sizeof(*arch_policy_rules), GFP_KERNEL);
+ if (!arch_policy_rules)
+ return 0;
+
+ arch_policy_entry = kcalloc(arch_entries + 1,
+ sizeof(*arch_policy_entry), GFP_KERNEL);
+
+ /* Convert arch policy string rules to struct ima_rule_entry format */
+ for (rules = arch_rules, i = 0; *rules != NULL; rules++) {
+ char rule[255];
+ int result;
+
+ result = strlcpy(rule, *rules, sizeof(rule));
+
+ INIT_LIST_HEAD(&arch_policy_entry[i].list);
+ result = ima_parse_rule(rule, &arch_policy_entry[i]);
+ if (result) {
+ pr_warn("Skipping unknown architecture policy rule: %s\n", rule);
+ memset(&arch_policy_entry[i], 0,
+ sizeof(*arch_policy_entry));
+ continue;
+ }
+ arch_policy_rules[i] = &arch_policy_entry[i];
+ i++;
+ }
+ return i;
+}
+
/**
* ima_init_policy - initialize the default measure rules.
*
@@ -482,6 +540,7 @@ static int ima_appraise_flag(enum ima_hooks func)
void __init ima_init_policy(void)
{
int i, measure_entries, appraise_entries, secure_boot_entries;
+ int arch_policy_entries;
/* if !ima_policy set entries = 0 so we load NO default rules */
measure_entries = ima_policy ? ARRAY_SIZE(dont_measure_rules) : 0;
@@ -507,6 +566,33 @@ void __init ima_init_policy(void)
break;
}
+ /*
+ * Based on runtime secure boot flags, insert arch specific measurement
+ * and appraise rules requiring file signatures for both the initial
+ * and custom policies, prior to other appraise rules.
+ * (Highest priority)
+ */
+ arch_policy_entries = ima_init_arch_policy();
+ if (arch_policy_entries > 0)
+ pr_info("Adding %d architecture policy rules.\n", arch_policy_entries);
+ for (i = 0; i < arch_policy_entries; i++) {
+ struct ima_rule_entry *entry;
+
+ list_add_tail(&arch_policy_rules[i]->list, &ima_default_rules);
+
+ entry = kmemdup(&arch_policy_entry[i], sizeof(*entry),
+ GFP_KERNEL);
+ if (!entry) {
+ WARN_ONCE(true, "Failed adding architecture rules to custom policy\n");
+ continue;
+ }
+
+ INIT_LIST_HEAD(&entry->list);
+ list_add_tail(&entry->list, &ima_policy_rules);
+ if (entry->action == APPRAISE)
+ build_ima_appraise |= ima_appraise_flag(entry->func);
+ }
+
/*
* Insert the builtin "secure_boot" policy rules requiring file
* signatures, prior to any other appraise rules.
@@ -576,6 +662,15 @@ void ima_update_policy(void)
if (ima_rules != policy) {
ima_policy_flag = 0;
ima_rules = policy;
+
+ /*
+ * IMA architecture specific policy rules are specified
+ * as strings and converted to an array of ima_entry_rules
+ * on boot. After loading a custom policy, free the
+ * architecture specific rules stored as an array.
+ */
+ kfree(arch_policy_rules);
+ kfree(arch_policy_entry);
}
ima_update_policy_flag();
}
--
2.14.4
Powered by blists - more mailing lists