wonderful-mobile/exynos-linux-stable
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

audit: eliminate unnecessary extra layer of watch references

Browse source 
The audit watch count was imbalanced, adding an unnecessary layer of watch
references.  Only add the second reference when it is added to a parent.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <pmoore@redhat.com>
This commit is contained in:
Richard Guy Briggs 2015-08-01 15:41:12 -04:00 • committed by Paul Moore
parent 0b08c5e594
commit f8259b262b
2 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/audit_watch.c
View file

@ -203,7 +203,6 @@ int audit_to_watch(struct audit_krule *krule, char *path, int len, u32 op)
if (IS_ERR(watch)) if (IS_ERR(watch))
return PTR_ERR(watch); return PTR_ERR(watch);
audit_get_watch(watch);
krule->watch = watch; krule->watch = watch;
return 0; return 0;
@ -387,8 +386,7 @@ static void audit_add_to_parent(struct audit_krule *krule,
watch_found = 1; watch_found = 1;
/* put krule's and initial refs to temporary watch */ /* put krule's ref to temporary watch */
audit_put_watch(watch);
audit_put_watch(watch); audit_put_watch(watch);
audit_get_watch(w); audit_get_watch(w);
@ -400,6 +398,7 @@ static void audit_add_to_parent(struct audit_krule *krule,
audit_get_parent(parent); audit_get_parent(parent);
watch->parent = parent; watch->parent = parent;
audit_get_watch(watch);
list_add(&watch->wlist, &parent->watches); list_add(&watch->wlist, &parent->watches);
} }
list_add(&krule->rlist, &watch->rules); list_add(&krule->rlist, &watch->rules);

16
kernel/auditfilter.c
View file

@ -549,8 +549,6 @@ exit_nofree:
return entry; return entry;
exit_free: exit_free:
if (entry->rule.watch)
audit_put_watch(entry->rule.watch); /* matches initial get */
if (entry->rule.tree) if (entry->rule.tree)
audit_put_tree(entry->rule.tree); /* that's the temporary one */ audit_put_tree(entry->rule.tree); /* that's the temporary one */
audit_free_rule(entry); audit_free_rule(entry);
@ -881,7 +879,7 @@ static inline int audit_add_rule(struct audit_entry *entry)
/* normally audit_add_tree_rule() will free it on failure */ /* normally audit_add_tree_rule() will free it on failure */
if (tree) if (tree)
audit_put_tree(tree); audit_put_tree(tree);
goto error; return err;
} }
if (watch) { if (watch) {
@ -895,14 +893,14 @@ static inline int audit_add_rule(struct audit_entry *entry)
*/ */
if (tree) if (tree)
audit_put_tree(tree); audit_put_tree(tree);
goto error; return err;
} }
} }
if (tree) { if (tree) {
err = audit_add_tree_rule(&entry->rule); err = audit_add_tree_rule(&entry->rule);
if (err) { if (err) {
mutex_unlock(&audit_filter_mutex); mutex_unlock(&audit_filter_mutex);
goto error; return err;
} }
} }
@ -933,11 +931,6 @@ static inline int audit_add_rule(struct audit_entry *entry)
#endif #endif
mutex_unlock(&audit_filter_mutex); mutex_unlock(&audit_filter_mutex);
return 0;
error:
if (watch)
audit_put_watch(watch); /* tmp watch, matches initial get */
return err; return err;
} }
@ -945,7 +938,6 @@ error:
static inline int audit_del_rule(struct audit_entry *entry) static inline int audit_del_rule(struct audit_entry *entry)
{ {
struct audit_entry *e; struct audit_entry *e;
struct audit_watch *watch = entry->rule.watch;
struct audit_tree *tree = entry->rule.tree; struct audit_tree *tree = entry->rule.tree;
struct list_head *list; struct list_head *list;
int ret = 0; int ret = 0;
@ -986,8 +978,6 @@ static inline int audit_del_rule(struct audit_entry *entry)
mutex_unlock(&audit_filter_mutex); mutex_unlock(&audit_filter_mutex);
out: out:
if (watch)
audit_put_watch(watch); /* match initial get */
if (tree) if (tree)
audit_put_tree(tree); /* that's the temporary one */ audit_put_tree(tree); /* that's the temporary one */