Skip to content

Commit

Permalink
ima: Directly assign the ima_default_policy pointer to ima_rules
Browse files Browse the repository at this point in the history
[ Upstream commit 067a436b1b0aafa593344fddd711a755a58afb3b ]

This patch prevents the following oops:

[   10.771813] BUG: kernel NULL pointer dereference, address: 0000000000000
[...]
[   10.779790] RIP: 0010:ima_match_policy+0xf7/0xb80
[...]
[   10.798576] Call Trace:
[   10.798993]  ? ima_lsm_policy_change+0x2b0/0x2b0
[   10.799753]  ? inode_init_owner+0x1a0/0x1a0
[   10.800484]  ? _raw_spin_lock+0x7a/0xd0
[   10.801592]  ima_must_appraise.part.0+0xb6/0xf0
[   10.802313]  ? ima_fix_xattr.isra.0+0xd0/0xd0
[   10.803167]  ima_must_appraise+0x4f/0x70
[   10.804004]  ima_post_path_mknod+0x2e/0x80
[   10.804800]  do_mknodat+0x396/0x3c0

It occurs when there is a failure during IMA initialization, and
ima_init_policy() is not called. IMA hooks still call ima_match_policy()
but ima_rules is NULL. This patch prevents the crash by directly assigning
the ima_default_policy pointer to ima_rules when ima_rules is defined. This
wouldn't alter the existing behavior, as ima_rules is always set at the end
of ima_init_policy().

Cc: [email protected] # 3.7.x
Fixes: 07f6a79 ("ima: add appraise action keywords and default rules")
Reported-by: Takashi Iwai <[email protected]>
Signed-off-by: Roberto Sassu <[email protected]>
Signed-off-by: Mimi Zohar <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
robertosassu authored and gregkh committed Jun 20, 2020
1 parent 9cd3c1b commit 0cd2876
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions security/integrity/ima/ima_policy.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ static struct ima_rule_entry default_appraise_rules[] = {

static LIST_HEAD(ima_default_rules);
static LIST_HEAD(ima_policy_rules);
static struct list_head *ima_rules;
static struct list_head *ima_rules = &ima_default_rules;

static DEFINE_MUTEX(ima_rules_mutex);

Expand Down Expand Up @@ -412,7 +412,6 @@ void __init ima_init_policy(void)
&ima_default_rules);
}

ima_rules = &ima_default_rules;
}

/**
Expand Down

0 comments on commit 0cd2876

Please sign in to comment.