{"id":809818,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809818/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504555874-4168-7-git-send-email-pablo@netfilter.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504555874-4168-7-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-04T20:11:08","name":"[06/12] net: Replace NF_CT_ASSERT() with WARN_ON().","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"1d27a6b3e825f1b88b08b4704cbe430ee867758c","submitter":{"id":1315,"url":"http://patchwork.ozlabs.org/api/1.2/people/1315/?format=json","name":"Pablo Neira Ayuso","email":"pablo@netfilter.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504555874-4168-7-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":1451,"url":"http://patchwork.ozlabs.org/api/1.2/series/1451/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=1451","date":"2017-09-04T20:11:02","name":"[01/12] netfilter: xt_hashlimit: add rate match mode","version":1,"mbox":"http://patchwork.ozlabs.org/series/1451/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809818/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809818/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmLcZ5GD8z9t2R\n\tfor ;\n\tTue, 5 Sep 2017 06:12:46 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754429AbdIDUMo (ORCPT );\n\tMon, 4 Sep 2017 16:12:44 -0400","from mail.us.es ([193.147.175.20]:42156 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1754676AbdIDULa (ORCPT );\n\tMon, 4 Sep 2017 16:11:30 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 5C395532F90\n\tfor ; Mon, 4 Sep 2017 22:11:02 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 4B7F4B5028\n\tfor ; Mon, 4 Sep 2017 22:11:02 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 4124DB5056; Mon, 4 Sep 2017 22:11:02 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id CA7D4B5027;\n\tMon, 4 Sep 2017 22:10:59 +0200 (CEST)","from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int\n\t(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); \n\tMon, 04 Sep 2017 22:10:59 +0200 (CEST)","from salvia.here (129.166.216.87.static.jazztel.es\n\t[87.216.166.129]) (Authenticated sender: pneira@us.es)\n\tby entrada.int (Postfix) with ESMTPA id 6B63D4265A20;\n\tMon, 4 Sep 2017 22:10:59 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.1 (2015-04-28) on\n\tantivirus1-rhel7.int","X-Spam-Level":"","X-Spam-Status":"No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50,\n\tSMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1","X-Virus-Status":"clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int)","X-SMTPAUTHUS":"auth mail.us.es","From":"Pablo Neira Ayuso ","To":"netfilter-devel@vger.kernel.org","Cc":"davem@davemloft.net, netdev@vger.kernel.org","Subject":"[PATCH 06/12] net: Replace NF_CT_ASSERT() with WARN_ON().","Date":"Mon, 4 Sep 2017 22:11:08 +0200","Message-Id":"<1504555874-4168-7-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504555874-4168-1-git-send-email-pablo@netfilter.org>","References":"<1504555874-4168-1-git-send-email-pablo@netfilter.org>","X-Virus-Scanned":"ClamAV using ClamSMTP","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Varsha Rao \n\nThis patch removes NF_CT_ASSERT() and instead uses WARN_ON().\n\nSigned-off-by: Varsha Rao \n---\n include/net/netfilter/nf_conntrack.h | 2 +-\n net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 2 +-\n net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 6 +++---\n net/ipv4/netfilter/nf_nat_masquerade_ipv4.c | 8 ++++----\n net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 +-\n net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 6 +++---\n net/ipv6/netfilter/nf_nat_masquerade_ipv6.c | 4 ++--\n net/netfilter/nf_conntrack_core.c | 11 +++++------\n net/netfilter/nf_conntrack_expect.c | 4 ++--\n net/netfilter/nf_conntrack_extend.c | 2 +-\n net/netfilter/nf_conntrack_standalone.c | 6 +++---\n net/netfilter/nf_nat_core.c | 4 ++--\n net/netfilter/nf_nat_redirect.c | 6 +++---\n net/netfilter/xt_NETMAP.c | 8 ++++----\n net/netfilter/xt_nat.c | 20 ++++++++++----------\n 15 files changed, 45 insertions(+), 46 deletions(-)","diff":"diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h\nindex 6e6f678aaac7..0385cb08c478 100644\n--- a/include/net/netfilter/nf_conntrack.h\n+++ b/include/net/netfilter/nf_conntrack.h\n@@ -159,7 +159,7 @@ nf_ct_get(const struct sk_buff *skb, enum ip_conntrack_info *ctinfo)\n /* decrement reference count on a conntrack */\n static inline void nf_ct_put(struct nf_conn *ct)\n {\n-\tNF_CT_ASSERT(ct);\n+\tWARN_ON(!ct);\n \tnf_conntrack_put(&ct->ct_general);\n }\n \ndiff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c\nindex ce108a996316..a046c298413a 100644\n--- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c\n+++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c\n@@ -126,7 +126,7 @@ icmp_error_message(struct net *net, struct nf_conn *tmpl, struct sk_buff *skb,\n \tenum ip_conntrack_info ctinfo;\n \tstruct nf_conntrack_zone tmp;\n \n-\tNF_CT_ASSERT(!skb_nfct(skb));\n+\tWARN_ON(skb_nfct(skb));\n \tzone = nf_ct_zone_tmpl(tmpl, skb, &tmp);\n \n \t/* Are they talking about one of our connections? */\ndiff --git a/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c b/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c\nindex feedd759ca80..a0f37b208268 100644\n--- a/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c\n+++ b/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c\n@@ -190,7 +190,7 @@ int nf_nat_icmp_reply_translation(struct sk_buff *skb,\n \tstruct nf_conntrack_tuple target;\n \tunsigned long statusbit;\n \n-\tNF_CT_ASSERT(ctinfo == IP_CT_RELATED || ctinfo == IP_CT_RELATED_REPLY);\n+\tWARN_ON(ctinfo != IP_CT_RELATED && ctinfo != IP_CT_RELATED_REPLY);\n \n \tif (!skb_make_writable(skb, hdrlen + sizeof(*inside)))\n \t\treturn 0;\n@@ -306,8 +306,8 @@ nf_nat_ipv4_fn(void *priv, struct sk_buff *skb,\n \n \tdefault:\n \t\t/* ESTABLISHED */\n-\t\tNF_CT_ASSERT(ctinfo == IP_CT_ESTABLISHED ||\n-\t\t\t ctinfo == IP_CT_ESTABLISHED_REPLY);\n+\t\tWARN_ON(ctinfo != IP_CT_ESTABLISHED &&\n+\t\t\tctinfo != IP_CT_ESTABLISHED_REPLY);\n \t\tif (nf_nat_oif_changed(state->hook, ctinfo, nat, state->out))\n \t\t\tgoto oif_changed;\n \t}\ndiff --git a/net/ipv4/netfilter/nf_nat_masquerade_ipv4.c b/net/ipv4/netfilter/nf_nat_masquerade_ipv4.c\nindex f39037fca923..0c366aad89cb 100644\n--- a/net/ipv4/netfilter/nf_nat_masquerade_ipv4.c\n+++ b/net/ipv4/netfilter/nf_nat_masquerade_ipv4.c\n@@ -34,12 +34,12 @@ nf_nat_masquerade_ipv4(struct sk_buff *skb, unsigned int hooknum,\n \tconst struct rtable *rt;\n \t__be32 newsrc, nh;\n \n-\tNF_CT_ASSERT(hooknum == NF_INET_POST_ROUTING);\n+\tWARN_ON(hooknum != NF_INET_POST_ROUTING);\n \n \tct = nf_ct_get(skb, &ctinfo);\n \n-\tNF_CT_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||\n-\t\t\t ctinfo == IP_CT_RELATED_REPLY));\n+\tWARN_ON(!(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||\n+\t\t\t ctinfo == IP_CT_RELATED_REPLY)));\n \n \t/* Source address is 0.0.0.0 - locally generated packet that is\n \t * probably not supposed to be masqueraded.\n@@ -96,7 +96,7 @@ static int masq_device_event(struct notifier_block *this,\n \t\t * conntracks which were associated with that device,\n \t\t * and forget them.\n \t\t */\n-\t\tNF_CT_ASSERT(dev->ifindex != 0);\n+\t\tWARN_ON(dev->ifindex == 0);\n \n \t\tnf_ct_iterate_cleanup_net(net, device_cmp,\n \t\t\t\t\t (void *)(long)dev->ifindex, 0, 0);\ndiff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c\nindex 30e34c4de003..a9e1fd1a8536 100644\n--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c\n+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c\n@@ -136,7 +136,7 @@ icmpv6_error_message(struct net *net, struct nf_conn *tmpl,\n \tenum ip_conntrack_info ctinfo;\n \tstruct nf_conntrack_zone tmp;\n \n-\tNF_CT_ASSERT(!skb_nfct(skb));\n+\tWARN_ON(skb_nfct(skb));\n \n \t/* Are they talking about one of our connections? */\n \tif (!nf_ct_get_tuplepr(skb,\ndiff --git a/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c b/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c\nindex b2b4f031b3a1..46d6dba50698 100644\n--- a/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c\n+++ b/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c\n@@ -196,7 +196,7 @@ int nf_nat_icmpv6_reply_translation(struct sk_buff *skb,\n \tstruct nf_conntrack_tuple target;\n \tunsigned long statusbit;\n \n-\tNF_CT_ASSERT(ctinfo == IP_CT_RELATED || ctinfo == IP_CT_RELATED_REPLY);\n+\tWARN_ON(ctinfo != IP_CT_RELATED && ctinfo != IP_CT_RELATED_REPLY);\n \n \tif (!skb_make_writable(skb, hdrlen + sizeof(*inside)))\n \t\treturn 0;\n@@ -319,8 +319,8 @@ nf_nat_ipv6_fn(void *priv, struct sk_buff *skb,\n \n \tdefault:\n \t\t/* ESTABLISHED */\n-\t\tNF_CT_ASSERT(ctinfo == IP_CT_ESTABLISHED ||\n-\t\t\t ctinfo == IP_CT_ESTABLISHED_REPLY);\n+\t\tWARN_ON(ctinfo != IP_CT_ESTABLISHED &&\n+\t\t\tctinfo != IP_CT_ESTABLISHED_REPLY);\n \t\tif (nf_nat_oif_changed(state->hook, ctinfo, nat, state->out))\n \t\t\tgoto oif_changed;\n \t}\ndiff --git a/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c b/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c\nindex d7b679037bae..98f61fcb9108 100644\n--- a/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c\n+++ b/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c\n@@ -36,8 +36,8 @@ nf_nat_masquerade_ipv6(struct sk_buff *skb, const struct nf_nat_range *range,\n \tstruct nf_nat_range newrange;\n \n \tct = nf_ct_get(skb, &ctinfo);\n-\tNF_CT_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||\n-\t\t\t ctinfo == IP_CT_RELATED_REPLY));\n+\tWARN_ON(!(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||\n+\t\t\t ctinfo == IP_CT_RELATED_REPLY)));\n \n \tif (ipv6_dev_get_saddr(nf_ct_net(ct), out,\n \t\t\t &ipv6_hdr(skb)->daddr, 0, &src) < 0)\ndiff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c\nindex ee5555dd7ebc..99c753c485ee 100644\n--- a/net/netfilter/nf_conntrack_core.c\n+++ b/net/netfilter/nf_conntrack_core.c\n@@ -403,7 +403,7 @@ destroy_conntrack(struct nf_conntrack *nfct)\n \tconst struct nf_conntrack_l4proto *l4proto;\n \n \tpr_debug(\"destroy_conntrack(%p)\\n\", ct);\n-\tNF_CT_ASSERT(atomic_read(&nfct->use) == 0);\n+\tWARN_ON(atomic_read(&nfct->use) != 0);\n \n \tif (unlikely(nf_ct_is_template(ct))) {\n \t\tnf_ct_tmpl_free(ct);\n@@ -756,12 +756,11 @@ __nf_conntrack_confirm(struct sk_buff *skb)\n \t * connections for unconfirmed conns. But packet copies and\n \t * REJECT will give spurious warnings here.\n \t */\n-\t/* NF_CT_ASSERT(atomic_read(&ct->ct_general.use) == 1); */\n \n \t/* No external references means no one else could have\n \t * confirmed us.\n \t */\n-\tNF_CT_ASSERT(!nf_ct_is_confirmed(ct));\n+\tWARN_ON(nf_ct_is_confirmed(ct));\n \tpr_debug(\"Confirming conntrack %p\\n\", ct);\n \t/* We have to check the DYING flag after unlink to prevent\n \t * a race against nf_ct_get_next_corpse() possibly called from\n@@ -1160,7 +1159,7 @@ void nf_conntrack_free(struct nf_conn *ct)\n \t/* A freed object has refcnt == 0, that's\n \t * the golden rule for SLAB_TYPESAFE_BY_RCU\n \t */\n-\tNF_CT_ASSERT(atomic_read(&ct->ct_general.use) == 0);\n+\tWARN_ON(atomic_read(&ct->ct_general.use) != 0);\n \n \tnf_ct_ext_destroy(ct);\n \tnf_ct_ext_free(ct);\n@@ -1468,7 +1467,7 @@ void nf_conntrack_alter_reply(struct nf_conn *ct,\n \tstruct nf_conn_help *help = nfct_help(ct);\n \n \t/* Should be unconfirmed, so not in hash table yet */\n-\tNF_CT_ASSERT(!nf_ct_is_confirmed(ct));\n+\tWARN_ON(nf_ct_is_confirmed(ct));\n \n \tpr_debug(\"Altering reply tuple of %p to \", ct);\n \tnf_ct_dump_tuple(newreply);\n@@ -1490,7 +1489,7 @@ void __nf_ct_refresh_acct(struct nf_conn *ct,\n \t\t\t unsigned long extra_jiffies,\n \t\t\t int do_acct)\n {\n-\tNF_CT_ASSERT(skb);\n+\tWARN_ON(!skb);\n \n \t/* Only update if this is not a fixed timeout */\n \tif (test_bit(IPS_FIXED_TIMEOUT_BIT, &ct->status))\ndiff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c\nindex dad2c0c22ad5..64778f9a8548 100644\n--- a/net/netfilter/nf_conntrack_expect.c\n+++ b/net/netfilter/nf_conntrack_expect.c\n@@ -51,8 +51,8 @@ void nf_ct_unlink_expect_report(struct nf_conntrack_expect *exp,\n \tstruct nf_conn_help *master_help = nfct_help(exp->master);\n \tstruct net *net = nf_ct_exp_net(exp);\n \n-\tNF_CT_ASSERT(master_help);\n-\tNF_CT_ASSERT(!timer_pending(&exp->timeout));\n+\tWARN_ON(!master_help);\n+\tWARN_ON(timer_pending(&exp->timeout));\n \n \thlist_del_rcu(&exp->hnode);\n \tnet->ct.expect_count--;\ndiff --git a/net/netfilter/nf_conntrack_extend.c b/net/netfilter/nf_conntrack_extend.c\nindex 6c605e88ebae..9fe0ddc333fb 100644\n--- a/net/netfilter/nf_conntrack_extend.c\n+++ b/net/netfilter/nf_conntrack_extend.c\n@@ -47,7 +47,7 @@ void *nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp)\n \tstruct nf_ct_ext_type *t;\n \n \t/* Conntrack must not be confirmed to avoid races on reallocation. */\n-\tNF_CT_ASSERT(!nf_ct_is_confirmed(ct));\n+\tWARN_ON(nf_ct_is_confirmed(ct));\n \n \told = ct->ext;\n \ndiff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c\nindex 9eb85858d764..5a101caa3e12 100644\n--- a/net/netfilter/nf_conntrack_standalone.c\n+++ b/net/netfilter/nf_conntrack_standalone.c\n@@ -287,7 +287,7 @@ static int ct_seq_show(struct seq_file *s, void *v)\n \tstruct net *net = seq_file_net(s);\n \tint ret = 0;\n \n-\tNF_CT_ASSERT(ct);\n+\tWARN_ON(!ct);\n \tif (unlikely(!atomic_inc_not_zero(&ct->ct_general.use)))\n \t\treturn 0;\n \n@@ -304,9 +304,9 @@ static int ct_seq_show(struct seq_file *s, void *v)\n \t\tgoto release;\n \n \tl3proto = __nf_ct_l3proto_find(nf_ct_l3num(ct));\n-\tNF_CT_ASSERT(l3proto);\n+\tWARN_ON(!l3proto);\n \tl4proto = __nf_ct_l4proto_find(nf_ct_l3num(ct), nf_ct_protonum(ct));\n-\tNF_CT_ASSERT(l4proto);\n+\tWARN_ON(!l4proto);\n \n \tret = -ENOSPC;\n \tseq_printf(s, \"%-8s %u %-8s %u %ld \",\ndiff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c\nindex b1d3740ae36a..40573aa6c133 100644\n--- a/net/netfilter/nf_nat_core.c\n+++ b/net/netfilter/nf_nat_core.c\n@@ -414,8 +414,8 @@ nf_nat_setup_info(struct nf_conn *ct,\n \tif (nf_ct_is_confirmed(ct))\n \t\treturn NF_ACCEPT;\n \n-\tNF_CT_ASSERT(maniptype == NF_NAT_MANIP_SRC ||\n-\t\t maniptype == NF_NAT_MANIP_DST);\n+\tWARN_ON(maniptype != NF_NAT_MANIP_SRC &&\n+\t\tmaniptype != NF_NAT_MANIP_DST);\n \tBUG_ON(nf_nat_initialized(ct, maniptype));\n \n \t/* What we've got will look like inverse of reply. Normally\ndiff --git a/net/netfilter/nf_nat_redirect.c b/net/netfilter/nf_nat_redirect.c\nindex 86067560a318..25b06b959118 100644\n--- a/net/netfilter/nf_nat_redirect.c\n+++ b/net/netfilter/nf_nat_redirect.c\n@@ -38,11 +38,11 @@ nf_nat_redirect_ipv4(struct sk_buff *skb,\n \t__be32 newdst;\n \tstruct nf_nat_range newrange;\n \n-\tNF_CT_ASSERT(hooknum == NF_INET_PRE_ROUTING ||\n-\t\t hooknum == NF_INET_LOCAL_OUT);\n+\tWARN_ON(hooknum != NF_INET_PRE_ROUTING &&\n+\t\thooknum != NF_INET_LOCAL_OUT);\n \n \tct = nf_ct_get(skb, &ctinfo);\n-\tNF_CT_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED));\n+\tWARN_ON(!(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED)));\n \n \t/* Local packets: make them go to loopback */\n \tif (hooknum == NF_INET_LOCAL_OUT) {\ndiff --git a/net/netfilter/xt_NETMAP.c b/net/netfilter/xt_NETMAP.c\nindex e45a01255e70..58aa9dd3c5b7 100644\n--- a/net/netfilter/xt_NETMAP.c\n+++ b/net/netfilter/xt_NETMAP.c\n@@ -77,10 +77,10 @@ netmap_tg4(struct sk_buff *skb, const struct xt_action_param *par)\n \tconst struct nf_nat_ipv4_multi_range_compat *mr = par->targinfo;\n \tstruct nf_nat_range newrange;\n \n-\tNF_CT_ASSERT(xt_hooknum(par) == NF_INET_PRE_ROUTING ||\n-\t\t xt_hooknum(par) == NF_INET_POST_ROUTING ||\n-\t\t xt_hooknum(par) == NF_INET_LOCAL_OUT ||\n-\t\t xt_hooknum(par) == NF_INET_LOCAL_IN);\n+\tWARN_ON(xt_hooknum(par) != NF_INET_PRE_ROUTING &&\n+\t\txt_hooknum(par) != NF_INET_POST_ROUTING &&\n+\t\txt_hooknum(par) != NF_INET_LOCAL_OUT &&\n+\t\txt_hooknum(par) != NF_INET_LOCAL_IN);\n \tct = nf_ct_get(skb, &ctinfo);\n \n \tnetmask = ~(mr->range[0].min_ip ^ mr->range[0].max_ip);\ndiff --git a/net/netfilter/xt_nat.c b/net/netfilter/xt_nat.c\nindex 8107b3eb865f..0fd14d1eb09d 100644\n--- a/net/netfilter/xt_nat.c\n+++ b/net/netfilter/xt_nat.c\n@@ -58,9 +58,9 @@ xt_snat_target_v0(struct sk_buff *skb, const struct xt_action_param *par)\n \tstruct nf_conn *ct;\n \n \tct = nf_ct_get(skb, &ctinfo);\n-\tNF_CT_ASSERT(ct != NULL &&\n-\t\t (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||\n-\t\t ctinfo == IP_CT_RELATED_REPLY));\n+\tWARN_ON(!(ct != NULL &&\n+\t\t (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||\n+\t\t ctinfo == IP_CT_RELATED_REPLY)));\n \n \txt_nat_convert_range(&range, &mr->range[0]);\n \treturn nf_nat_setup_info(ct, &range, NF_NAT_MANIP_SRC);\n@@ -75,8 +75,8 @@ xt_dnat_target_v0(struct sk_buff *skb, const struct xt_action_param *par)\n \tstruct nf_conn *ct;\n \n \tct = nf_ct_get(skb, &ctinfo);\n-\tNF_CT_ASSERT(ct != NULL &&\n-\t\t (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED));\n+\tWARN_ON(!(ct != NULL &&\n+\t\t (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED)));\n \n \txt_nat_convert_range(&range, &mr->range[0]);\n \treturn nf_nat_setup_info(ct, &range, NF_NAT_MANIP_DST);\n@@ -90,9 +90,9 @@ xt_snat_target_v1(struct sk_buff *skb, const struct xt_action_param *par)\n \tstruct nf_conn *ct;\n \n \tct = nf_ct_get(skb, &ctinfo);\n-\tNF_CT_ASSERT(ct != NULL &&\n-\t\t (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||\n-\t\t ctinfo == IP_CT_RELATED_REPLY));\n+\tWARN_ON(!(ct != NULL &&\n+\t\t (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||\n+\t\t ctinfo == IP_CT_RELATED_REPLY)));\n \n \treturn nf_nat_setup_info(ct, range, NF_NAT_MANIP_SRC);\n }\n@@ -105,8 +105,8 @@ xt_dnat_target_v1(struct sk_buff *skb, const struct xt_action_param *par)\n \tstruct nf_conn *ct;\n \n \tct = nf_ct_get(skb, &ctinfo);\n-\tNF_CT_ASSERT(ct != NULL &&\n-\t\t (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED));\n+\tWARN_ON(!(ct != NULL &&\n+\t\t (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED)));\n \n \treturn nf_nat_setup_info(ct, range, NF_NAT_MANIP_DST);\n }\n","prefixes":["06/12"]}