2 files changed, 3 insertions, 4 deletions

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index c8259ac38745..29f7f0121491 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3936,7 +3936,8 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
                 return false;
 
         if (len <= skb_tailroom(to)) {
-                BUG_ON(skb_copy_bits(from, 0, skb_put(to, len), len));
+                if (len)
+                        BUG_ON(skb_copy_bits(from, 0, skb_put(to, len), len));
                 *delta_truesize = 0;
                 return true;
         }
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 8f639a4face9..228bf0c5ff19 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4143,9 +4143,6 @@ static bool tcp_try_coalesce(struct sock *sk,
 
         *fragstolen = false;
 
-        if (tcp_hdr(from)->fin)
-                return false;
-
         /* Its possible this segment overlaps with prior segment in queue */
         if (TCP_SKB_CB(from)->seq != TCP_SKB_CB(to)->end_seq)
                 return false;
@@ -4158,6 +4155,7 @@ static bool tcp_try_coalesce(struct sock *sk,
         NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPRCVCOALESCE);
         TCP_SKB_CB(to)->end_seq = TCP_SKB_CB(from)->end_seq;
         TCP_SKB_CB(to)->ack_seq = TCP_SKB_CB(from)->ack_seq;
+        TCP_SKB_CB(to)->tcp_flags |= TCP_SKB_CB(from)->tcp_flags;
         return true;
 }