From 08fe548a7d578535f3938409a4c5fc30f8ecb903 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 26 Dec 2022 21:48:49 -0500 Subject: [PATCH] Fixes for 5.10 Signed-off-by: Sasha Levin --- .../ima-simplify-ima_lsm_copy_rule.patch | 66 +++++++++++++++++++ queue-5.10/series | 1 + 2 files changed, 67 insertions(+) create mode 100644 queue-5.10/ima-simplify-ima_lsm_copy_rule.patch diff --git a/queue-5.10/ima-simplify-ima_lsm_copy_rule.patch b/queue-5.10/ima-simplify-ima_lsm_copy_rule.patch new file mode 100644 index 00000000000..e0c424d35c0 --- /dev/null +++ b/queue-5.10/ima-simplify-ima_lsm_copy_rule.patch @@ -0,0 +1,66 @@ +From 1fc65da3a0dd2094b2e10ae5dc5071be16250b01 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 21 Sep 2022 20:58:03 +0800 +Subject: ima: Simplify ima_lsm_copy_rule + +From: GUO Zihua + +[ Upstream commit d57378d3aa4d864d9e590482602068af1b20c0c5 ] + +Currently ima_lsm_copy_rule() set the arg_p field of the source rule to +NULL, so that the source rule could be freed afterward. It does not make +sense for this behavior to be inside a "copy" function. So move it +outside and let the caller handle this field. + +ima_lsm_copy_rule() now produce a shallow copy of the original entry +including args_p field. Meaning only the lsm.rule and the rule itself +should be freed for the original rule. Thus, instead of calling +ima_lsm_free_rule() which frees lsm.rule as well as args_p field, free +the lsm.rule directly. + +Signed-off-by: GUO Zihua +Reviewed-by: Roberto Sassu +Signed-off-by: Mimi Zohar +Signed-off-by: Sasha Levin +--- + security/integrity/ima/ima_policy.c | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c +index a83ce111cf50..96ecb7d25403 100644 +--- a/security/integrity/ima/ima_policy.c ++++ b/security/integrity/ima/ima_policy.c +@@ -370,12 +370,6 @@ static struct ima_rule_entry *ima_lsm_copy_rule(struct ima_rule_entry *entry) + + nentry->lsm[i].type = entry->lsm[i].type; + nentry->lsm[i].args_p = entry->lsm[i].args_p; +- /* +- * Remove the reference from entry so that the associated +- * memory will not be freed during a later call to +- * ima_lsm_free_rule(entry). +- */ +- entry->lsm[i].args_p = NULL; + + ima_filter_rule_init(nentry->lsm[i].type, Audit_equal, + nentry->lsm[i].args_p, +@@ -389,6 +383,7 @@ static struct ima_rule_entry *ima_lsm_copy_rule(struct ima_rule_entry *entry) + + static int ima_lsm_update_rule(struct ima_rule_entry *entry) + { ++ int i; + struct ima_rule_entry *nentry; + + nentry = ima_lsm_copy_rule(entry); +@@ -403,7 +398,8 @@ static int ima_lsm_update_rule(struct ima_rule_entry *entry) + * references and the entry itself. All other memory refrences will now + * be owned by nentry. + */ +- ima_lsm_free_rule(entry); ++ for (i = 0; i < MAX_LSM_RULES; i++) ++ ima_filter_rule_free(entry->lsm[i].rule); + kfree(entry); + + return 0; +-- +2.35.1 + diff --git a/queue-5.10/series b/queue-5.10/series index 5f4951ea387..5420c9a1232 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -557,3 +557,4 @@ pstore-switch-pmsg_lock-to-an-rt_mutex-to-avoid-prio.patch perf-debug-set-debug_peo_args-and-redirect_to_stderr.patch afs-fix-lost-servers_outstanding-count.patch pstore-make-sure-config_pstore_pmsg-selects-config_r.patch +ima-simplify-ima_lsm_copy_rule.patch -- 2.47.3