2 files changed, 8 insertions, 0 deletions

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 794aeafeb782..dd3102a37ef9 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -786,11 +786,14 @@ static int udp_send_skb(struct sk_buff *skb, struct flowi4 *fl4,
                         return -EINVAL;
                 if (skb->len > cork->gso_size * UDP_MAX_SEGMENTS)
                         return -EINVAL;
+                if (sk->sk_no_check_tx)
+                        return -EINVAL;
                 if (skb->ip_summed != CHECKSUM_PARTIAL || is_udplite)
                         return -EIO;
 
                 skb_shinfo(skb)->gso_size = cork->gso_size;
                 skb_shinfo(skb)->gso_type = SKB_GSO_UDP_L4;
+                goto csum_partial;
         }
 
         if (is_udplite)                                  /*     UDP-Lite      */
@@ -802,6 +805,7 @@ static int udp_send_skb(struct sk_buff *skb, struct flowi4 *fl4,
                 goto send;
 
         } else if (skb->ip_summed == CHECKSUM_PARTIAL) { /* UDP hardware csum */
+csum_partial:
 
                 udp4_hwcsum(skb, fl4->saddr, fl4->daddr);
                 goto send;
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 6acfdd3e442b..a34e28ac03a7 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1051,11 +1051,14 @@ static int udp_v6_send_skb(struct sk_buff *skb, struct flowi6 *fl6,
                         return -EINVAL;
                 if (skb->len > cork->gso_size * UDP_MAX_SEGMENTS)
                         return -EINVAL;
+                if (udp_sk(sk)->no_check6_tx)
+                        return -EINVAL;
                 if (skb->ip_summed != CHECKSUM_PARTIAL || is_udplite)
                         return -EIO;
 
                 skb_shinfo(skb)->gso_size = cork->gso_size;
                 skb_shinfo(skb)->gso_type = SKB_GSO_UDP_L4;
+                goto csum_partial;
         }
 
         if (is_udplite)
@@ -1064,6 +1067,7 @@ static int udp_v6_send_skb(struct sk_buff *skb, struct flowi6 *fl6,
                 skb->ip_summed = CHECKSUM_NONE;
                 goto send;
         } else if (skb->ip_summed == CHECKSUM_PARTIAL) { /* UDP hardware csum */
+csum_partial:
                 udp6_hwcsum_outgoing(sk, skb, &fl6->saddr, &fl6->daddr, len);
                 goto send;
         } else