From: Stefan Berger <stefanb@linux.ibm.com>
To: linux-integrity@vger.kernel.org
Cc: zohar@linux.ibm.com, serge@hallyn.com,
christian.brauner@ubuntu.com, 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 v13 09/26] ima: Move ima_lsm_policy_notifier into ima_namespace
Date: Thu, 7 Jul 2022 10:47:43 -0400 [thread overview]
Message-ID: <20220707144800.828288-10-stefanb@linux.ibm.com> (raw)
In-Reply-To: <20220707144800.828288-1-stefanb@linux.ibm.com>
Move the ima_lsm_policy_notifier into the ima_namespace. Each IMA
namespace can now register its own LSM policy change notifier callback.
The policy change notifier for the init_ima_ns still remains in init_ima()
and therefore handle the registration of the callback for all other
namespaces in init_ima_namespace().
Rate-limit the kernel warning 'rule for LSM <label> is undefined` for
IMA namespace to avoid flooding the kernel log with this type of message.
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
Acked-by: Serge Hallyn <serge@hallyn.com>
---
v11:
- Renamed 'rc' to 'ret'
- Use pr_warn_ratelimited('rule for LSM...') for IMA namespaces
v10:
- Only call pr_warn('rule for LSM <label> is undefined`) for init_ima_ns
---
security/integrity/ima/ima.h | 2 ++
security/integrity/ima/ima_init_ima_ns.c | 14 +++++++++++++
security/integrity/ima/ima_main.c | 6 +-----
security/integrity/ima/ima_policy.c | 26 ++++++++++++++++--------
4 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index b35c8504ef87..c68b5117d034 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -144,6 +144,8 @@ struct ima_namespace {
int valid_policy;
struct dentry *ima_policy;
+
+ struct notifier_block ima_lsm_policy_notifier;
} __randomize_layout;
extern struct ima_namespace init_ima_ns;
diff --git a/security/integrity/ima/ima_init_ima_ns.c b/security/integrity/ima/ima_init_ima_ns.c
index 425eed1c6838..c4fe8f3e9a73 100644
--- a/security/integrity/ima/ima_init_ima_ns.c
+++ b/security/integrity/ima/ima_init_ima_ns.c
@@ -10,6 +10,8 @@
static int ima_init_namespace(struct ima_namespace *ns)
{
+ int ret;
+
INIT_LIST_HEAD(&ns->ima_default_rules);
INIT_LIST_HEAD(&ns->ima_policy_rules);
INIT_LIST_HEAD(&ns->ima_temp_rules);
@@ -30,6 +32,15 @@ static int ima_init_namespace(struct ima_namespace *ns)
ns->valid_policy = 1;
ns->ima_fs_flags = 0;
+ if (ns != &init_ima_ns) {
+ ns->ima_lsm_policy_notifier.notifier_call =
+ ima_lsm_policy_change;
+ ret = register_blocking_lsm_notifier
+ (&ns->ima_lsm_policy_notifier);
+ if (ret)
+ return ret;
+ }
+
return 0;
}
@@ -39,5 +50,8 @@ int __init ima_ns_init(void)
}
struct ima_namespace init_ima_ns = {
+ .ima_lsm_policy_notifier = {
+ .notifier_call = ima_lsm_policy_change,
+ },
};
EXPORT_SYMBOL(init_ima_ns);
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index d27454d029e2..789415f65204 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -38,10 +38,6 @@ int ima_appraise;
int __ro_after_init ima_hash_algo = HASH_ALGO_SHA1;
static int hash_setup_done;
-static struct notifier_block ima_lsm_policy_notifier = {
- .notifier_call = ima_lsm_policy_change,
-};
-
static int __init hash_setup(char *str)
{
struct ima_template_desc *template_desc = ima_template_desc_current();
@@ -1089,7 +1085,7 @@ static int __init init_ima(void)
if (error)
return error;
- error = register_blocking_lsm_notifier(&ima_lsm_policy_notifier);
+ error = register_blocking_lsm_notifier(&ns->ima_lsm_policy_notifier);
if (error)
pr_warn("Couldn't register LSM notifier, error %d\n", error);
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index fe1096fd2703..d1e8a3d22e2b 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -368,7 +368,8 @@ static void ima_free_rule(struct ima_rule_entry *entry)
kfree(entry);
}
-static struct ima_rule_entry *ima_lsm_copy_rule(struct ima_rule_entry *entry)
+static struct ima_rule_entry *ima_lsm_copy_rule(struct ima_namespace *ns,
+ struct ima_rule_entry *entry)
{
struct ima_rule_entry *nentry;
int i;
@@ -399,18 +400,25 @@ static struct ima_rule_entry *ima_lsm_copy_rule(struct ima_rule_entry *entry)
ima_filter_rule_init(nentry->lsm[i].type, Audit_equal,
nentry->lsm[i].args_p,
&nentry->lsm[i].rule);
- if (!nentry->lsm[i].rule)
- pr_warn("rule for LSM \'%s\' is undefined\n",
- nentry->lsm[i].args_p);
+ if (!nentry->lsm[i].rule) {
+ if (ns == &init_ima_ns)
+ pr_warn("rule for LSM \'%s\' is undefined\n",
+ nentry->lsm[i].args_p);
+ else
+ pr_warn_ratelimited
+ ("rule for LSM \'%s\' is undefined\n",
+ nentry->lsm[i].args_p);
+ }
}
return nentry;
}
-static int ima_lsm_update_rule(struct ima_rule_entry *entry)
+static int ima_lsm_update_rule(struct ima_namespace *ns,
+ struct ima_rule_entry *entry)
{
struct ima_rule_entry *nentry;
- nentry = ima_lsm_copy_rule(entry);
+ nentry = ima_lsm_copy_rule(ns, entry);
if (!nentry)
return -ENOMEM;
@@ -453,7 +461,7 @@ static void ima_lsm_update_rules(struct ima_namespace *ns)
if (!ima_rule_contains_lsm_cond(entry))
continue;
- result = ima_lsm_update_rule(entry);
+ result = ima_lsm_update_rule(ns, entry);
if (result) {
pr_err("lsm rule update error %d\n", result);
return;
@@ -464,12 +472,14 @@ static void ima_lsm_update_rules(struct ima_namespace *ns)
int ima_lsm_policy_change(struct notifier_block *nb, unsigned long event,
void *lsm_data)
{
- struct ima_namespace *ns = &init_ima_ns;
+ struct ima_namespace *ns;
if (event != LSM_POLICY_CHANGE)
return NOTIFY_DONE;
+ ns = container_of(nb, struct ima_namespace, ima_lsm_policy_notifier);
ima_lsm_update_rules(ns);
+
return NOTIFY_OK;
}
--
2.36.1
next prev parent reply other threads:[~2022-07-07 14:48 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-07 14:47 [PATCH v13 00/26] ima: Namespace IMA with audit support in IMA-ns Stefan Berger
2022-07-07 14:47 ` [PATCH v13 01/26] securityfs: rework dentry creation Stefan Berger
2022-07-07 14:47 ` [PATCH v13 02/26] securityfs: Extend securityfs with namespacing support Stefan Berger
2022-07-07 14:47 ` [PATCH v13 03/26] ima: Define ima_namespace struct and start moving variables into it Stefan Berger
2022-07-07 14:47 ` [PATCH v13 04/26] ima: Move arch_policy_entry into ima_namespace Stefan Berger
2022-07-07 14:47 ` [PATCH v13 05/26] ima: Move ima_htable " Stefan Berger
2022-07-07 14:47 ` [PATCH v13 06/26] ima: Move measurement list related variables " Stefan Berger
2022-07-07 14:47 ` [PATCH v13 07/26] ima: Move some IMA policy and filesystem " Stefan Berger
2022-07-07 14:47 ` [PATCH v13 08/26] ima: Move IMA securityfs files into ima_namespace or onto stack Stefan Berger
2022-07-07 14:47 ` Stefan Berger [this message]
2022-07-07 14:47 ` [PATCH v13 10/26] ima: Switch to lazy lsm policy updates for better performance Stefan Berger
2022-07-07 14:47 ` [PATCH v13 11/26] ima: Define mac_admin_ns_capable() as a wrapper for ns_capable() Stefan Berger
2022-07-07 14:47 ` [PATCH v13 12/26] ima: Only accept AUDIT rules for non-init_ima_ns namespaces for now Stefan Berger
2022-07-07 14:47 ` [PATCH v13 13/26] userns: Add pointer to ima_namespace to user_namespace Stefan Berger
2022-07-07 14:47 ` [PATCH v13 14/26] ima: Implement hierarchical processing of file accesses Stefan Berger
2022-07-07 14:47 ` [PATCH v13 15/26] ima: Implement ima_free_policy_rules() for freeing of an ima_namespace Stefan Berger
2022-07-07 14:47 ` [PATCH v13 16/26] ima: Add functions for creating and " Stefan Berger
2022-07-07 14:47 ` [PATCH v13 17/26] integrity/ima: Define ns_status for storing namespaced iint data Stefan Berger
2022-07-07 14:47 ` [PATCH v13 18/26] integrity: Add optional callback function to integrity_inode_free() Stefan Berger
2022-07-07 14:47 ` [PATCH v13 19/26] ima: Namespace audit status flags Stefan Berger
2022-07-07 14:47 ` [PATCH v13 20/26] ima: Remove unused iints from the integrity_iint_cache Stefan Berger
2022-07-07 14:47 ` [PATCH v13 21/26] ima: Setup securityfs for IMA namespace Stefan Berger
2022-07-07 14:47 ` [PATCH v13 22/26] ima: Introduce securityfs file to activate an " Stefan Berger
2022-07-07 14:47 ` [PATCH v13 23/26] ima: Show owning user namespace's uid and gid when displaying policy Stefan Berger
2022-07-07 14:47 ` [PATCH v13 24/26] ima: Limit number of policy rules in non-init_ima_ns Stefan Berger
2022-07-07 14:47 ` [PATCH v13 25/26] ima: Restrict informational audit messages to init_ima_ns Stefan Berger
2022-07-07 14:48 ` [PATCH v13 26/26] ima: Enable IMA namespaces 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=20220707144800.828288-10-stefanb@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=christian.brauner@ubuntu.com \
--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).