Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932581AbYAaMBQ (ORCPT ); Thu, 31 Jan 2008 07:01:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1764353AbYAaMAs (ORCPT ); Thu, 31 Jan 2008 07:00:48 -0500 Received: from swsoft-msk-nat.sw.ru ([195.214.232.10]:59328 "EHLO iris.sw.ru" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1763915AbYAaMAr (ORCPT ); Thu, 31 Jan 2008 07:00:47 -0500 From: "Denis V. Lunev" To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devel@openvz.org, "Denis V. Lunev" Subject: [PATCH 1/6] [IPV4]: Fix memory leak on error path during FIB initialization. Date: Thu, 31 Jan 2008 15:00:45 +0300 Message-Id: <1201780850-22216-1-git-send-email-den@openvz.org> X-Mailer: git-send-email 1.5.3.7 In-Reply-To: <47A1B835.7050600@sw.ru> References: <47A1B835.7050600@sw.ru> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1404 Lines: 47 net->ipv4.fib_table_hash is not freed when fib4_rules_init failed. The problem has been introduced by the following commit. commit c8050bf6d84785a7edd2e81591e8f833231477e8 Author: Denis V. Lunev Date: Thu Jan 10 03:28:24 2008 -0800 Signed-off-by: Denis V. Lunev --- net/ipv4/fib_frontend.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index d282618..d0507f4 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -975,6 +975,7 @@ static struct notifier_block fib_netdev_notifier = { static int __net_init ip_fib_net_init(struct net *net) { + int err; unsigned int i; net->ipv4.fib_table_hash = kzalloc( @@ -985,7 +986,14 @@ static int __net_init ip_fib_net_init(struct net *net) for (i = 0; i < FIB_TABLE_HASHSZ; i++) INIT_HLIST_HEAD(&net->ipv4.fib_table_hash[i]); - return fib4_rules_init(net); + err = fib4_rules_init(net); + if (err < 0) + goto fail; + return 0; + +fail: + kfree(net->ipv4.fib_table_hash); + return err; } static void __net_exit ip_fib_net_exit(struct net *net) -- 1.5.3.rc5 -- 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/