Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753017Ab3DQEEp (ORCPT ); Wed, 17 Apr 2013 00:04:45 -0400 Received: from intranet.asianux.com ([58.214.24.6]:25894 "EHLO intranet.asianux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752237Ab3DQEEo (ORCPT ); Wed, 17 Apr 2013 00:04:44 -0400 X-Spam-Score: -100.8 Message-ID: <516E1F32.6010009@asianux.com> Date: Wed, 17 Apr 2013 12:04:02 +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: Eric Paris , Al Viro CC: "linux-kernel@vger.kernel.org" , Andrew Morton Subject: [PATCH v2] kernel: audit_tree: resource management: need put_tree and goto Err when failure occures References: <516790ED.6060202@asianux.com> <516CFF2C.7010509@asianux.com> In-Reply-To: <516CFF2C.7010509@asianux.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1345 Lines: 48 since "normally audit_add_tree_rule() will free it on failure", need free it completely, when failure occures. need additional put_tree before return, since get_tree was called. always need goto error processing area for list_del_init. Signed-off-by: Chen Gang --- kernel/audit_tree.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index 642a89c..9dfb0da 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c @@ -694,13 +694,15 @@ int audit_add_tree_rule(struct audit_krule *rule) spin_unlock(&hash_lock); } else { trim_marked(tree); + put_tree(tree); goto Err; } mutex_lock(&audit_filter_mutex); if (list_empty(&rule->rlist)) { put_tree(tree); - return -ENOENT; + err = -ENOENT; + goto Err1; } rule->tree = tree; put_tree(tree); @@ -708,6 +710,7 @@ int audit_add_tree_rule(struct audit_krule *rule) return 0; Err: mutex_lock(&audit_filter_mutex); +Err1: list_del_init(&tree->list); list_del_init(&tree->rules); put_tree(tree); -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/