From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752194Ab3EJKNS (ORCPT ); Fri, 10 May 2013 06:13:18 -0400 Received: from intranet.asianux.com ([58.214.24.6]:12985 "EHLO intranet.asianux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751152Ab3EJKNR (ORCPT ); Fri, 10 May 2013 06:13:17 -0400 X-Spam-Score: -100.8 Message-ID: <518CC80A.3070608@asianux.com> Date: Fri, 10 May 2013 18:12:26 +0800 From: Chen Gang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: Andrew Morton CC: Al Viro , Eric Paris , "linux-kernel@vger.kernel.org" Subject: [PATCH] kernel/auditfilter.c: need process 'tree' when audit_add_watch() failed in audit_add_rule(). Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If both 'tree' and 'watch' are valid, need call audit_put_tree(), just like the upper area has done within function audit_add_rule(). Signed-off-by: Chen Gang --- kernel/auditfilter.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index f9fc54b..81f63f9 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -952,6 +952,12 @@ static inline int audit_add_rule(struct audit_entry *entry) err = audit_add_watch(&entry->rule, &list); if (err) { mutex_unlock(&audit_filter_mutex); + /* + * normally audit_add_tree_rule() will free it + * on failure + */ + if (tree) + audit_put_tree(tree); goto error; } } -- 1.7.7.6