ipv4: Pass struct net into ip_defrag and ip_check_defrag

The function ip_defrag is called on both the input and the output
paths of the networking stack.  In particular conntrack when it is
tracking outbound packets from the local machine calls ip_defrag.

So add a struct net parameter and stop making ip_defrag guess which
network namespace it needs to defragment packets in.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 396b3f1e7cc0..691660b9b7ef 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1439,17 +1439,17 @@ static int packet_rcv_fanout(struct sk_buff *skb, struct net_device *dev,
 {
         struct packet_fanout *f = pt->af_packet_priv;
         unsigned int num = READ_ONCE(f->num_members);
+        struct net *net = read_pnet(&f->net);
         struct packet_sock *po;
         unsigned int idx;
 
-        if (!net_eq(dev_net(dev), read_pnet(&f->net)) ||
-            !num) {
+        if (!net_eq(dev_net(dev), net) || !num) {
                 kfree_skb(skb);
                 return 0;
         }
 
         if (fanout_has_flag(f, PACKET_FANOUT_FLAG_DEFRAG)) {
-                skb = ip_check_defrag(skb, IP_DEFRAG_AF_PACKET);
+                skb = ip_check_defrag(net, skb, IP_DEFRAG_AF_PACKET);
                 if (!skb)
                         return 0;
         }