From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759368Ab3ERDUs (ORCPT ); Fri, 17 May 2013 23:20:48 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:8107 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758580Ab3ERDAJ (ORCPT ); Fri, 17 May 2013 23:00:09 -0400 X-Authority-Analysis: v=2.0 cv=DKcNElxb c=1 sm=0 a=rXTBtCOcEpjy1lPqhTCpEQ==:17 a=mNMOxpOpBa8A:10 a=Ciwy3NGCPMMA:10 a=P8ucVt-_SakA:10 a=5SG0PmZfjMsA:10 a=bbbx4UPp9XUA:10 a=meVymXHHAAAA:8 a=Lc7_ganVjssA:10 a=40MIqcmNAAAA:8 a=Z4Rwk6OoAAAA:8 a=drOt6m5kAAAA:8 a=20KFwNOVAAAA:8 a=aCPqOQJ_S1qBLZ7JjQ4A:9 a=-tENaG0q7zQA:10 a=jbrJJM5MRmoA:10 a=jEp0ucaQiEUA:10 a=jeBq3FmKZ4MA:10 a=rXTBtCOcEpjy1lPqhTCpEQ==:117 X-Cloudmark-Score: 0 X-Authenticated-User: X-Originating-IP: 74.67.115.198 Message-Id: <20130518021703.072734317@goodmis.org> User-Agent: quilt/0.60-1 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: X-Mailing-List: linux-kernel@vger.kernel.org 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