aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Gang2013-04-29 17:05:19 -0500
committerGreg Kroah-Hartman2013-05-11 15:54:10 -0500
commitfccd6eb97dab4cf45b2cda8278d5a7582cd40d08 (patch)
tree4b11aa6bdb0d8444d2cafa845b545d35cde2341c
parent76e7f478a400a76a37a05848cc2e9263e0d0cb40 (diff)
downloadkernel-omap-fccd6eb97dab4cf45b2cda8278d5a7582cd40d08.tar.gz
kernel-omap-fccd6eb97dab4cf45b2cda8278d5a7582cd40d08.tar.xz
kernel-omap-fccd6eb97dab4cf45b2cda8278d5a7582cd40d08.zip
kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees()
commit 12b2f117f3bf738c1a00a6f64393f1953a740bd4 upstream. 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> Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--kernel/audit_tree.c2
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);
622skip_it: 621skip_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);