From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130518021703.072734317@goodmis.org> Date: Fri, 17 May 2013 22:18:11 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chen Gang , Al Viro , Eric Paris , Andrew Morton Subject: [ 134/136 ] kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees() References: <20130518021557.139113314@goodmis.org> Content-Disposition: inline; filename=0134-kernel-audit_tree.c-tree-will-leak-memory-when-failu.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.4 stable review patch. If anyone has any objections, please let me know. ------------------ From: Chen Gang [ Upstream commit 12b2f117f3bf738c1a00a6f64393f1953a740bd4 ] 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 Cc: Al Viro Cc: Eric Paris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Steven Rostedt --- kernel/audit_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index ed206fd..23b8c66 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c @@ -609,9 +609,9 @@ void audit_trim_trees(void) } spin_unlock(&hash_lock); trim_marked(tree); - put_tree(tree); drop_collected_mounts(root_mnt); skip_it: + put_tree(tree); mutex_lock(&audit_filter_mutex); } list_del(&cursor); -- 1.7.10.4