projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (10825): Add ids for Yuan PD378S DVB adapter
[linux-2.6-block.git]
/
kernel
/
audit_tree.c
diff --git
a/kernel/audit_tree.c
b/kernel/audit_tree.c
index 8b509441f49a2f740a2d709c66cecc73d9896f1c..8ad9545b8db9e67203c49f37ece0a3da30f42b28 100644
(file)
--- 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);
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);
}
}
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 ||
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);
rule->inode_f || rule->watch || rule->tree)
return -EINVAL;
rule->tree = alloc_tree(pathname);