1 files changed, 18 insertions, 23 deletions

diff --git a/net/netfilter/ipvs/ip_vs_proto_udp.c b/net/netfilter/ipvs/ip_vs_proto_udp.c
index 2fedb2dcb3d..503a842c90d 100644
--- a/net/netfilter/ipvs/ip_vs_proto_udp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_udp.c
@@ -30,23 +30,22 @@
 
 static int
 udp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,
-                  int *verdict, struct ip_vs_conn **cpp)
+                  int *verdict, struct ip_vs_conn **cpp,
+                  struct ip_vs_iphdr *iph)
 {
         struct net *net;
         struct ip_vs_service *svc;
         struct udphdr _udph, *uh;
-        struct ip_vs_iphdr iph;
 
-        ip_vs_fill_iphdr(af, skb_network_header(skb), &iph);
-
-        uh = skb_header_pointer(skb, iph.len, sizeof(_udph), &_udph);
+        /* IPv6 fragments, only first fragment will hit this */
+        uh = skb_header_pointer(skb, iph->len, sizeof(_udph), &_udph);
         if (uh == NULL) {
                 *verdict = NF_DROP;
                 return 0;
         }
         net = skb_net(skb);
-        svc = ip_vs_service_get(net, af, skb->mark, iph.protocol,
-                                &iph.daddr, uh->dest);
+        svc = ip_vs_service_get(net, af, skb->mark, iph->protocol,
+                                &iph->daddr, uh->dest);
         if (svc) {
                 int ignored;
 
@@ -64,10 +63,10 @@ udp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,
                  * Let the virtual server select a real server for the
                  * incoming connection, and create a connection entry.
                  */
-                *cpp = ip_vs_schedule(svc, skb, pd, &ignored);
+                *cpp = ip_vs_schedule(svc, skb, pd, &ignored, iph);
                 if (!*cpp && ignored <= 0) {
                         if (!ignored)
-                                *verdict = ip_vs_leave(svc, skb, pd);
+                                *verdict = ip_vs_leave(svc, skb, pd, iph);
                         else {
                                 ip_vs_service_put(svc);
                                 *verdict = NF_DROP;
@@ -125,20 +124,18 @@ udp_partial_csum_update(int af, struct udphdr *uhdr,
 
 
 static int
-udp_snat_handler(struct sk_buff *skb,
-                 struct ip_vs_protocol *pp, struct ip_vs_conn *cp)
+udp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
+                 struct ip_vs_conn *cp, struct ip_vs_iphdr *iph)
 {
         struct udphdr *udph;
-        unsigned int udphoff;
+        unsigned int udphoff = iph->len;
         int oldlen;
         int payload_csum = 0;
 
 #ifdef CONFIG_IP_VS_IPV6
-        if (cp->af == AF_INET6)
-                udphoff = sizeof(struct ipv6hdr);
-        else
+        if (cp->af == AF_INET6 && iph->fragoffs)
+                return 1;
 #endif
-                udphoff = ip_hdrlen(skb);
         oldlen = skb->len - udphoff;
 
         /* csum_check requires unshared skb */
@@ -210,20 +207,18 @@ udp_snat_handler(struct sk_buff *skb,
 
 
 static int
-udp_dnat_handler(struct sk_buff *skb,
-                 struct ip_vs_protocol *pp, struct ip_vs_conn *cp)
+udp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
+                 struct ip_vs_conn *cp, struct ip_vs_iphdr *iph)
 {
         struct udphdr *udph;
-        unsigned int udphoff;
+        unsigned int udphoff = iph->len;
         int oldlen;
         int payload_csum = 0;
 
 #ifdef CONFIG_IP_VS_IPV6
-        if (cp->af == AF_INET6)
-                udphoff = sizeof(struct ipv6hdr);
-        else
+        if (cp->af == AF_INET6 && iph->fragoffs)
+                return 1;
 #endif
-                udphoff = ip_hdrlen(skb);
         oldlen = skb->len - udphoff;
 
         /* csum_check requires unshared skb */