diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-05 13:53:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-05 13:53:39 +0100 |
| commit | 5359c32eb7402124abc9964d5d53639fe0739cea (patch) | |
| tree | d77b6967fe8420678bb9d1d936855ac0699c196a /kernel/audit_tree.c | |
| parent | 8916edef5888c5d8fe283714416a9ca95b4c3431 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
| download | kernel_samsung_smdk4412-5359c32eb7402124abc9964d5d53639fe0739cea.zip kernel_samsung_smdk4412-5359c32eb7402124abc9964d5d53639fe0739cea.tar.gz kernel_samsung_smdk4412-5359c32eb7402124abc9964d5d53639fe0739cea.tar.bz2 | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'kernel/audit_tree.c')
| -rw-r--r-- | kernel/audit_tree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index 8b50944..8ad9545 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c @@ -450,6 +450,7 @@ static void kill_rules(struct audit_tree *tree) audit_log_end(ab); rule->tree = NULL; list_del_rcu(&entry->list); + list_del(&entry->rule.list); call_rcu(&entry->rcu, audit_free_rule_rcu); } } @@ -617,7 +618,7 @@ int audit_make_tree(struct audit_krule *rule, char *pathname, u32 op) if (pathname[0] != '/' || rule->listnr != AUDIT_FILTER_EXIT || - op & ~AUDIT_EQUAL || + op != Audit_equal || rule->inode_f || rule->watch || rule->tree) return -EINVAL; rule->tree = alloc_tree(pathname); |