1 files changed, 9 insertions, 6 deletions

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index cf755156a684..14bc654b6842 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -821,6 +821,7 @@ static int udp_send_skb(struct sk_buff *skb, struct flowi4 *fl4,
         int is_udplite = IS_UDPLITE(sk);
         int offset = skb_transport_offset(skb);
         int len = skb->len - offset;
+        int datalen = len - sizeof(*uh);
         __wsum csum = 0;
 
         /*
@@ -854,10 +855,12 @@ static int udp_send_skb(struct sk_buff *skb, struct flowi4 *fl4,
                         return -EIO;
                 }
 
-                skb_shinfo(skb)->gso_size = cork->gso_size;
-                skb_shinfo(skb)->gso_type = SKB_GSO_UDP_L4;
-                skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(len - sizeof(uh),
-                                                         cork->gso_size);
+                if (datalen > cork->gso_size) {
+                        skb_shinfo(skb)->gso_size = cork->gso_size;
+                        skb_shinfo(skb)->gso_type = SKB_GSO_UDP_L4;
+                        skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(datalen,
+                                                                 cork->gso_size);
+                }
                 goto csum_partial;
         }
 
@@ -1969,7 +1972,7 @@ static int udp_queue_rcv_one_skb(struct sock *sk, struct sk_buff *skb)
          */
         if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))
                 goto drop;
-        nf_reset(skb);
+        nf_reset_ct(skb);
 
         if (static_branch_unlikely(&udp_encap_needed_key) && up->encap_type) {
                 int (*encap_rcv)(struct sock *sk, struct sk_buff *skb);
@@ -2298,7 +2301,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
 
         if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))
                 goto drop;
-        nf_reset(skb);
+        nf_reset_ct(skb);
 
         /* No socket. Drop packet silently, if checksum is wrong */
         if (udp_lib_checksum_complete(skb))