1 files changed, 16 insertions, 2 deletions

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index a6aecf76a71b..e51da8c092fa 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -107,6 +107,21 @@ static struct sock *__udp6_lib_lookup(struct net *net,
         return result;
 }
 
+static struct sock *__udp6_lib_lookup_skb(struct sk_buff *skb,
+                                          __be16 sport, __be16 dport,
+                                          struct hlist_head udptable[])
+{
+        struct sock *sk;
+        struct ipv6hdr *iph = ipv6_hdr(skb);
+
+        if (unlikely(sk = skb_steal_sock(skb)))
+                return sk;
+        else
+                return __udp6_lib_lookup(dev_net(skb->dst->dev), &iph->saddr, sport,
+                                         &iph->daddr, dport, inet6_iif(skb),
+                                         udptable);
+}
+
 /*
  *      This should be easy, if there is something there we
  *      return it, otherwise we block.
@@ -488,8 +503,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[],
          * check socket cache ... must talk to Alan about his plans
          * for sock caches... i'll skip this for now.
          */
-        sk = __udp6_lib_lookup(net, saddr, uh->source,
-                               daddr, uh->dest, inet6_iif(skb), udptable);
+        sk = __udp6_lib_lookup_skb(skb, uh->source, uh->dest, udptable);
 
         if (sk == NULL) {
                 if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))