xfrm: add route lookup to xfrm4_rcv_encap
authorSabrina Dubroca <sd@queasysnail.net>
Mon, 25 Nov 2019 13:48:59 +0000 (14:48 +0100)
committerSteffen Klassert <steffen.klassert@secunet.com>
Mon, 9 Dec 2019 08:59:07 +0000 (09:59 +0100)
At this point, with TCP encapsulation, the dst may be gone, but
xfrm_input needs one.

Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
net/ipv4/xfrm4_protocol.c

index 8a42857..ea595c8 100644 (file)
@@ -72,6 +72,14 @@ int xfrm4_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi,
        if (!head)
                goto out;
 
+       if (!skb_dst(skb)) {
+               const struct iphdr *iph = ip_hdr(skb);
+
+               if (ip_route_input_noref(skb, iph->daddr, iph->saddr,
+                                        iph->tos, skb->dev))
+                       goto drop;
+       }
+
        for_each_protocol_rcu(*head, handler)
                if ((ret = handler->input_handler(skb, nexthdr, spi, encap_type)) != -EINVAL)
                        return ret;
@@ -79,6 +87,7 @@ int xfrm4_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi,
 out:
        icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
 
+drop:
        kfree_skb(skb);
        return 0;
 }