Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a9511fd authored by Stefan Berger's avatar Stefan Berger Committed by Greg Kroah-Hartman
Browse files

ima: Do not print policy rule with inactive LSM labels 



commit 89677197ae709eb1ab3646952c44f6a171c9e74c 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: 483ec26eed42 ("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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89e51f2a

security/integrity/ima/ima_policy.c

+8 −0
Original line number Diff line number Diff line
@@ -1382,6 +1382,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)