diff options
| author |   Stefan Berger <stefanb@linux.ibm.com> | 2022-02-01 15:37:10 -0500 |
|---|---|---|
| committer |   Mimi Zohar <zohar@linux.ibm.com> | 2022-02-02 11:59:54 -0500 |
| commit | 89677197ae709eb1ab3646952c44f6a171c9e74c (patch) | |
| tree | 504c5dbd0728afec519023fb2a9b948b15bf208f /security/integrity | |
| parent | ima: Allow template selection with ima_template[_fmt]= after ima_hash= (diff) | |
| download | linux-dev-89677197ae709eb1ab3646952c44f6a171c9e74c.tar.xz linux-dev-89677197ae709eb1ab3646952c44f6a171c9e74c.zip | |
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: 483ec26eed42 ("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>
Diffstat (limited to 'security/integrity')
| -rw-r--r-- | security/integrity/ima/ima_policy.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 320ca80aacab..2a1f6418b10a 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -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) |