1 files changed, 23 insertions, 1 deletions

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 4c79dc5329bc..c55698d19d68 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -554,7 +554,7 @@ void udpv6_encap_enable(void)
 }
 EXPORT_SYMBOL(udpv6_encap_enable);
 
-static int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+static int udpv6_queue_rcv_one_skb(struct sock *sk, struct sk_buff *skb)
 {
         struct udp_sock *up = udp_sk(sk);
         int is_udplite = IS_UDPLITE(sk);
@@ -637,6 +637,28 @@ drop:
         return -1;
 }
 
+static int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+{
+        struct sk_buff *next, *segs;
+        int ret;
+
+        if (likely(!udp_unexpected_gso(sk, skb)))
+                return udpv6_queue_rcv_one_skb(sk, skb);
+
+        __skb_push(skb, -skb_mac_offset(skb));
+        segs = udp_rcv_segment(sk, skb, false);
+        for (skb = segs; skb; skb = next) {
+                next = skb->next;
+                __skb_pull(skb, skb_transport_offset(skb));
+
+                ret = udpv6_queue_rcv_one_skb(sk, skb);
+                if (ret > 0)
+                        ip6_protocol_deliver_rcu(dev_net(skb->dev), skb, ret,
+                                                 true);
+        }
+        return 0;
+}
+
 static bool __udp_v6_is_mcast_sock(struct net *net, struct sock *sk,
                                    __be16 loc_port, const struct in6_addr *loc_addr,
                                    __be16 rmt_port, const struct in6_addr *rmt_addr,