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

Commit cb9c6836 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

skbuff: add and use skb_nfct helper 



Followup patch renames skb->nfct and changes its type so add a helper to
avoid intrusive rename change later.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 97a6ad13

include/linux/skbuff.h

+10 −3
Original line number Diff line number Diff line
@@ -3553,6 +3553,15 @@ static inline void skb_remcsum_process(struct sk_buff *skb, void *ptr, 
	skb->csum = csum_add(skb->csum, delta);

}



static inline struct nf_conntrack *skb_nfct(const struct sk_buff *skb)

{

#if IS_ENABLED(CONFIG_NF_CONNTRACK)

	return skb->nfct;

#else

	return NULL;

#endif

}



#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

void nf_conntrack_destroy(struct nf_conntrack *nfct);

static inline void nf_conntrack_put(struct nf_conntrack *nfct)
@@ -3652,9 +3661,7 @@ static inline bool skb_irq_freeable(const struct sk_buff *skb) 
#if IS_ENABLED(CONFIG_XFRM)

		!skb->sp &&

#endif

#if IS_ENABLED(CONFIG_NF_CONNTRACK)

		!skb->nfct &&

#endif

		!skb_nfct(skb) &&

		!skb->_skb_refdst &&

		!skb_has_frag_list(skb);

}

include/net/netfilter/nf_conntrack_core.h

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ int __nf_conntrack_confirm(struct sk_buff *skb); 
/* Confirm a connection: returns NF_DROP if packet must be dropped. */

static inline int nf_conntrack_confirm(struct sk_buff *skb)

{

	struct nf_conn *ct = (struct nf_conn *)skb->nfct;

	struct nf_conn *ct = (struct nf_conn *)skb_nfct(skb);

	int ret = NF_ACCEPT;



	if (ct && !nf_ct_is_untracked(ct)) {

net/core/skbuff.c

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ static void skb_release_head_state(struct sk_buff *skb) 
		skb->destructor(skb);

	}

#if IS_ENABLED(CONFIG_NF_CONNTRACK)

	nf_conntrack_put(skb->nfct);

	nf_conntrack_put(skb_nfct(skb));

#endif

#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)

	nf_bridge_put(skb->nf_bridge);

net/ipv4/netfilter/ipt_SYNPROXY.c

+4 −4
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ synproxy_send_client_synack(struct net *net, 


	synproxy_build_options(nth, opts);



	synproxy_send_tcp(net, skb, nskb, skb->nfct, IP_CT_ESTABLISHED_REPLY,

			  niph, nth, tcp_hdr_size);

	synproxy_send_tcp(net, skb, nskb, skb_nfct(skb),

			  IP_CT_ESTABLISHED_REPLY, niph, nth, tcp_hdr_size);

}



static void
@@ -230,8 +230,8 @@ synproxy_send_client_ack(struct net *net, 


	synproxy_build_options(nth, opts);



	synproxy_send_tcp(net, skb, nskb, skb->nfct, IP_CT_ESTABLISHED_REPLY,

			  niph, nth, tcp_hdr_size);

	synproxy_send_tcp(net, skb, nskb, skb_nfct(skb),

			  IP_CT_ESTABLISHED_REPLY, niph, nth, tcp_hdr_size);

}



static bool

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,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 == NULL);

	NF_CT_ASSERT(!skb_nfct(skb));

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



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