Skip to content

Commit

Permalink
ima: Do not print policy rule with inactive LSM labels
Browse files Browse the repository at this point in the history
commit 8967719 upstream.

Before printing a policy rule scan for inactive LSM labels in the policy
rule. Inactive LSM labels are identified by args_p != NULL and
rule == NULL.

Fixes: 483ec26 ("ima: ima/lsm policy rule loading logic bug fixes")
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Cc: <stable@vger.kernel.org> # v5.6+
Acked-by: Christian Brauner <brauner@kernel.org>
[zohar@linux.ibm.com: Updated "Fixes" tag]
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
stefanberger authored and gregkh committed Feb 16, 2022
1 parent 5389ea6 commit cf4570c
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions security/integrity/ima/ima_policy.c
Original file line number Diff line number Diff line change
Expand Up @@ -1852,6 +1852,14 @@ int ima_policy_show(struct seq_file *m, void *v)

rcu_read_lock();

/* Do not print rules with inactive LSM labels */
for (i = 0; i < MAX_LSM_RULES; i++) {
if (entry->lsm[i].args_p && !entry->lsm[i].rule) {
rcu_read_unlock();
return 0;
}
}

if (entry->action & MEASURE)
seq_puts(m, pt(Opt_measure));
if (entry->action & DONT_MEASURE)
Expand Down

0 comments on commit cf4570c

Please sign in to comment.