ipv4: tcp: dont cache unconfirmed intput dst

[karo-tx-linux.git] / net / ipv4 / ip_fragment.c

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 9dbd3dd6022d40f2f9fdbfa0e3a433a33963c886..978d55f256eac7b949a71fe423f3ece37d3eb215 100644 (file)
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -171,6 +171,10 @@ static void frag_kfree_skb(struct netns_frags *nf, struct sk_buff *skb)
 static void ip4_frag_init(struct inet_frag_queue *q, void *a)
 {
        struct ipq *qp = container_of(q, struct ipq, q);
+       struct netns_ipv4 *ipv4 = container_of(q->net, struct netns_ipv4,
+                                              frags);
+       struct net *net = container_of(ipv4, struct net, ipv4);
+
        struct ip4_create_arg *arg = a;
 
        qp->protocol = arg->iph->protocol;
@@ -180,7 +184,7 @@ static void ip4_frag_init(struct inet_frag_queue *q, void *a)
        qp->daddr = arg->iph->daddr;
        qp->user = arg->user;
        qp->peer = sysctl_ipfrag_max_dist ?
-               inet_getpeer_v4(arg->iph->saddr, 1) : NULL;
+               inet_getpeer_v4(net->ipv4.peers, arg->iph->saddr, 1) : NULL;
 }
 
 static __inline__ void ip4_frag_free(struct inet_frag_queue *q)
@@ -255,7 +259,7 @@ static void ip_expire(unsigned long arg)
                skb_dst_drop(head);
                iph = ip_hdr(head);
                err = ip_route_input_noref(head, iph->daddr, iph->saddr,
-                                          iph->tos, head->dev);
+                                          iph->tos, head->dev, false);
                if (err)
                        goto out_rcu_unlock;