From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xiaotian Feng Subject: [PATCH] netfilter: don't xt_jumpstack_alloc twice in xt_register_table Date: Mon, 31 May 2010 19:06:38 +0800 Message-ID: <1275303998-2435-1-git-send-email-dfeng@redhat.com> Return-path: Sender: netdev-owner@vger.kernel.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: netfilter-devel@vger.kernel.org, netfilter@vger.kernel.org, coreteam@netfilter.org Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Xiaotian Feng , Patrick McHardy , "David S. Miller" , Jan Engelhardt , Andrew Morton , Rusty Russell , Alexey Dobriyan In xt_register_table, xt_jumpstack_alloc is called first, later xt_replace_table is used. But in xt_replace_table, xt_jumpstack_alloc will be used again. Then the memory allocated by previous xt_jumpstack_alloc will be leaked. We can simply remove the previous xt_jumpstack_alloc because there aren't any users of newinfo between xt_jumpstack_alloc and xt_replace_table. Signed-off-by: Xiaotian Feng Cc: Patrick McHardy Cc: "David S. Miller" Cc: Jan Engelhardt Cc: Andrew Morton Cc: Rusty Russell Cc: Alexey Dobriyan --- net/netfilter/x_tables.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index 445de70..47b1e79 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c @@ -844,10 +844,6 @@ struct xt_table *xt_register_table(struct net *net, struct xt_table_info *private; struct xt_table *t, *table; - ret = xt_jumpstack_alloc(newinfo); - if (ret < 0) - return ERR_PTR(ret); - /* Don't add one object to multiple lists. */ table = kmemdup(input_table, sizeof(struct xt_table), GFP_KERNEL); if (!table) { -- 1.7.0.1