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

Commit b7277597 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

ipv6: Pass struct net into nf_ct_frag6_gather 



The function nf_ct_frag6_gather is called on both the input and the
output paths of the networking stack.  In particular ipv6_defrag which
calls nf_ct_frag6_gather is called from both the the PRE_ROUTING chain
on input and the LOCAL_OUT chain on output.

The addition of a net parameter makes it explicit which network
namespace the packets are being reassembled in, and removes the need
for nf_ct_frag6_gather to guess.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 19bcf9f2

include/net/netfilter/ipv6/nf_defrag_ipv6.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ void nf_defrag_ipv6_enable(void); 


int nf_ct_frag6_init(void);

void nf_ct_frag6_cleanup(void);

struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user);

struct sk_buff *nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user);

void nf_ct_frag6_consume_orig(struct sk_buff *skb);



struct inet_frags_ctl;

net/ipv6/netfilter/nf_conntrack_reasm.c

+1 −3
Original line number Diff line number Diff line
@@ -563,12 +563,10 @@ find_prev_fhdr(struct sk_buff *skb, u8 *prevhdrp, int *prevhoff, int *fhoff) 
	return 0;

}



struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user)

struct sk_buff *nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user)

{

	struct sk_buff *clone;

	struct net_device *dev = skb->dev;

	struct net *net = skb_dst(skb) ? dev_net(skb_dst(skb)->dev)

				       : dev_net(skb->dev);

	struct frag_hdr *fhdr;

	struct frag_queue *fq;

	struct ipv6hdr *hdr;

net/ipv6/netfilter/nf_defrag_ipv6_hooks.c

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ static unsigned int ipv6_defrag(void *priv, 
		return NF_ACCEPT;

#endif



	reasm = nf_ct_frag6_gather(skb, nf_ct6_defrag_user(state->hook, skb));

	reasm = nf_ct_frag6_gather(state->net, skb,

				   nf_ct6_defrag_user(state->hook, skb));

	/* queued */

	if (reasm == NULL)

		return NF_STOLEN;

net/openvswitch/conntrack.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static int handle_fragments(struct net *net, struct sw_flow_key *key, 
		struct sk_buff *reasm;



		memset(IP6CB(skb), 0, sizeof(struct inet6_skb_parm));

		reasm = nf_ct_frag6_gather(skb, user);

		reasm = nf_ct_frag6_gather(net, skb, user);

		if (!reasm)

			return -EINPROGRESS;