Commit 89677197 authored by Stefan Berger's avatar Stefan Berger Committed by Mimi Zohar
Browse files

ima: Do not print policy rule with inactive LSM labels



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: 483ec26e ("ima: ima/lsm policy rule loading logic bug fixes")
Signed-off-by: default avatarStefan Berger <stefanb@linux.ibm.com>
Cc: <stable@vger.kernel.org> # v5.6+
Acked-by: default avatarChristian Brauner <brauner@kernel.org>
[zohar@linux.ibm.com: Updated "Fixes" tag]
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
parent bb8e52e4
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -1967,6 +1967,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)