From: Holger Eitzenberger Subject: [PATCH] [NETFILTER] Remove BUG_ON() in destroy_conntrack() Date: Thu, 2 Feb 2006 12:38:26 +0100 Message-ID: <11388803061179-git-send-email-heitzenberger@astaro.com> References: <11388803061231-git-send-email-heitzenberger@astaro.com> Reply-To: Holger Eitzenberger Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit Cc: Harald Welte , Patrick McHardy Return-path: In-Reply-To: <11388803061231-git-send-email-heitzenberger@astaro.com> To: netfilter-devel@lists.netfilter.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: netfilter-devel-bounces@lists.netfilter.org Errors-To: netfilter-devel-bounces@lists.netfilter.org List-Id: netfilter-devel.vger.kernel.org Remove BUG_ON(list_empty(...)) check in destroy_conntrack because it is perfectly valid for conntracks to be in no list at all, e. g. if ct_sync is used. Signed-off-by: Harald Welte Signed-off-by: Patrick McHardy Signed-off-by: Holger Eitzenberger --- net/ipv4/netfilter/ip_conntrack_core.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) 8f62bac9822927ea1306d4752ca48cb1d9f73ff0 diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c index 14660db..6bec236 100644 --- a/net/ipv4/netfilter/ip_conntrack_core.c +++ b/net/ipv4/netfilter/ip_conntrack_core.c @@ -339,10 +339,8 @@ destroy_conntrack(struct nf_conntrack *n ip_ct_remove_expectations(ct); /* We overload first tuple to link into unconfirmed list. */ - if (!is_confirmed(ct)) { - BUG_ON(list_empty(&ct->tuplehash[IP_CT_DIR_ORIGINAL].list)); + if (!is_confirmed(ct)) list_del(&ct->tuplehash[IP_CT_DIR_ORIGINAL].list); - } CONNTRACK_STAT_INC(delete); write_unlock_bh(&ip_conntrack_lock); -- -dirty