Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44d6e2f2 authored by Varsha Rao's avatar Varsha Rao Committed by Pablo Neira Ayuso
Browse files

net: Replace NF_CT_ASSERT() with WARN_ON(). 



This patch removes NF_CT_ASSERT() and instead uses WARN_ON().

Signed-off-by: default avatarVarsha Rao <rvarsha016@gmail.com>
parent d1c1e39d

include/net/netfilter/nf_conntrack.h

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ nf_ct_get(const struct sk_buff *skb, enum ip_conntrack_info *ctinfo) 
/* decrement reference count on a conntrack */

static inline void nf_ct_put(struct nf_conn *ct)

{

	NF_CT_ASSERT(ct);

	WARN_ON(!ct);

	nf_conntrack_put(&ct->ct_general);

}

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ icmp_error_message(struct net *net, struct nf_conn *tmpl, struct sk_buff *skb, 
	enum ip_conntrack_info ctinfo;

	struct nf_conntrack_zone tmp;



	NF_CT_ASSERT(!skb_nfct(skb));

	WARN_ON(skb_nfct(skb));

	zone = nf_ct_zone_tmpl(tmpl, skb, &tmp);



	/* Are they talking about one of our connections? */

net/ipv4/netfilter/nf_nat_l3proto_ipv4.c

+3 −3
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ int nf_nat_icmp_reply_translation(struct sk_buff *skb, 
	struct nf_conntrack_tuple target;

	unsigned long statusbit;



	NF_CT_ASSERT(ctinfo == IP_CT_RELATED || ctinfo == IP_CT_RELATED_REPLY);

	WARN_ON(ctinfo != IP_CT_RELATED && ctinfo != IP_CT_RELATED_REPLY);



	if (!skb_make_writable(skb, hdrlen + sizeof(*inside)))

		return 0;
@@ -306,8 +306,8 @@ nf_nat_ipv4_fn(void *priv, struct sk_buff *skb, 


	default:

		/* ESTABLISHED */

		NF_CT_ASSERT(ctinfo == IP_CT_ESTABLISHED ||

			     ctinfo == IP_CT_ESTABLISHED_REPLY);

		WARN_ON(ctinfo != IP_CT_ESTABLISHED &&

			ctinfo != IP_CT_ESTABLISHED_REPLY);

		if (nf_nat_oif_changed(state->hook, ctinfo, nat, state->out))

			goto oif_changed;

	}

net/ipv4/netfilter/nf_nat_masquerade_ipv4.c

+4 −4
Original line number Diff line number Diff line
@@ -34,12 +34,12 @@ nf_nat_masquerade_ipv4(struct sk_buff *skb, unsigned int hooknum, 
	const struct rtable *rt;

	__be32 newsrc, nh;



	NF_CT_ASSERT(hooknum == NF_INET_POST_ROUTING);

	WARN_ON(hooknum != NF_INET_POST_ROUTING);



	ct = nf_ct_get(skb, &ctinfo);



	NF_CT_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||

			    ctinfo == IP_CT_RELATED_REPLY));

	WARN_ON(!(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||

			 ctinfo == IP_CT_RELATED_REPLY)));



	/* Source address is 0.0.0.0 - locally generated packet that is

	 * probably not supposed to be masqueraded.
@@ -96,7 +96,7 @@ static int masq_device_event(struct notifier_block *this, 
		 * conntracks which were associated with that device,

		 * and forget them.

		 */

		NF_CT_ASSERT(dev->ifindex != 0);

		WARN_ON(dev->ifindex == 0);



		nf_ct_iterate_cleanup_net(net, device_cmp,

					  (void *)(long)dev->ifindex, 0, 0);

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ icmpv6_error_message(struct net *net, struct nf_conn *tmpl, 
	enum ip_conntrack_info ctinfo;

	struct nf_conntrack_zone tmp;



	NF_CT_ASSERT(!skb_nfct(skb));

	WARN_ON(skb_nfct(skb));



	/* Are they talking about one of our connections? */

	if (!nf_ct_get_tuplepr(skb,