diff options
author | Chen Gang <gang.chen@asianux.com> | 2013-04-29 18:05:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 18:54:26 -0400 |
commit | 12b2f117f3bf738c1a00a6f64393f1953a740bd4 (patch) | |
tree | acbf54228d7b99e1b2fb984e9cc6619dea199738 /kernel/audit_tree.c | |
parent | 373e0f3408fe671550d69d9a7965d8a49e988525 (diff) |
kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees()
audit_trim_trees() calls get_tree(). If a failure occurs we must call
put_tree().
[akpm@linux-foundation.org: run put_tree() before mutex_lock() for small scalability improvement]
Signed-off-by: Chen Gang <gang.chen@asianux.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Eric Paris <eparis@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/audit_tree.c')
-rw-r--r-- | kernel/audit_tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index 642a89c4f3d6..a291aa23fb3f 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c | |||
@@ -617,9 +617,9 @@ void audit_trim_trees(void) | |||
617 | } | 617 | } |
618 | spin_unlock(&hash_lock); | 618 | spin_unlock(&hash_lock); |
619 | trim_marked(tree); | 619 | trim_marked(tree); |
620 | put_tree(tree); | ||
621 | drop_collected_mounts(root_mnt); | 620 | drop_collected_mounts(root_mnt); |
622 | skip_it: | 621 | skip_it: |
622 | put_tree(tree); | ||
623 | mutex_lock(&audit_filter_mutex); | 623 | mutex_lock(&audit_filter_mutex); |
624 | } | 624 | } |
625 | list_del(&cursor); | 625 | list_del(&cursor); |