From patchwork Sun Apr 8 02:08:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao feng X-Patchwork-Id: 151334 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0F886B7008 for ; Sun, 8 Apr 2012 12:08:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752645Ab2DHCIL (ORCPT ); Sat, 7 Apr 2012 22:08:11 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:48222 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751987Ab2DHCIL (ORCPT ); Sat, 7 Apr 2012 22:08:11 -0400 X-IronPort-AV: E=Sophos;i="4.75,388,1330876800"; d="scan'208";a="4703977" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 08 Apr 2012 10:07:52 +0800 Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id q382881G018711; Sun, 8 Apr 2012 10:08:08 +0800 Received: from Donkey.fnst.cn.fujitsu.com ([10.167.225.206]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012040810074248-98539 ; Sun, 8 Apr 2012 10:07:42 +0800 From: Gao feng To: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org Cc: Gao feng Subject: [PATCH] netfilter: fix incorrect logic in nf_conntrack_init_net Date: Sun, 8 Apr 2012 10:08:28 +0800 Message-Id: <1333850908-3108-1-git-send-email-gaofeng@cn.fujitsu.com> X-Mailer: git-send-email 1.7.7.6 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/04/08 10:07:42, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/04/08 10:07:42, Serialize complete at 2012/04/08 10:07:42 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org in function nf_conntrack_init_net,when nf_conntrack_timeout_init falied, we should call nf_conntrack_ecache_fini to do rollback. but the current code calls nf_conntrack_timeout_fini. Signed-off-by: Gao feng --- net/netfilter/nf_conntrack_core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 3cc4487..729f157 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1592,7 +1592,7 @@ static int nf_conntrack_init_net(struct net *net) return 0; err_timeout: - nf_conntrack_timeout_fini(net); + nf_conntrack_ecache_fini(net); err_ecache: nf_conntrack_tstamp_fini(net); err_tstamp: