2 files changed, 14 insertions, 6 deletions

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index c7a90b546b21..822c9deac83b 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -306,11 +306,15 @@ static inline struct sock *__udp4_lib_lookup_skb(struct sk_buff *skb,
                                                  __be16 sport, __be16 dport,
                                                  struct hlist_head udptable[])
 {
+        struct sock *sk;
         const struct iphdr *iph = ip_hdr(skb);
 
-        return __udp4_lib_lookup(dev_net(skb->dst->dev), iph->saddr, sport,
-                                 iph->daddr, dport, inet_iif(skb),
-                                 udptable);
+        if (unlikely(sk = skb_steal_sock(skb)))
+                return sk;
+        else
+                return __udp4_lib_lookup(dev_net(skb->dst->dev), iph->saddr, sport,
+                                         iph->daddr, dport, inet_iif(skb),
+                                         udptable);
 }
 
 struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index ce26c41d157d..e51da8c092fa 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -111,11 +111,15 @@ 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);
 
-        return __udp6_lib_lookup(dev_net(skb->dst->dev), &iph->saddr, sport,
-                                 &iph->daddr, dport, inet6_iif(skb),
-                                 udptable);
+        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);
 }
 
 /*