diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index e767721b3a588b5d56567ae7badf5dffcd35a76a..9efbd742150d0a4f0ee15d5b7ee43b2e52543c3b 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2710,7 +2710,7 @@ void tcp_shutdown(struct sock *sk, int how)
        /* If we've already sent a FIN, or it's a closed state, skip this. */
        if ((1 << sk->sk_state) &
            (TCPF_ESTABLISHED | TCPF_SYN_SENT |
-            TCPF_SYN_RECV | TCPF_CLOSE_WAIT)) {
+            TCPF_CLOSE_WAIT)) {
                /* Clear out any half completed packets.  FIN if needed. */
                if (tcp_close_state(sk))
                        tcp_send_fin(sk);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 5d874817a78db31a4a807ab80e9158300329423d..a140d9f7a0a36e6a0b90c97a44a1e54e7639c71f 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -6761,6 +6761,8 @@ tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)
 
                tcp_initialize_rcv_mss(sk);
                tcp_fast_path_on(tp);
+               if (sk->sk_shutdown & SEND_SHUTDOWN)
+                       tcp_shutdown(sk, SEND_SHUTDOWN);
                break;
 
        case TCP_FIN_WAIT1: {
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index e3167ad965676facaacd8f82848c52cf966f97c3..02caeb7bcf6342713019d31891998fdbe426b573 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -3563,7 +3563,9 @@ void tcp_send_fin(struct sock *sk)
                        return;
                }
        } else {
-               skb = alloc_skb_fclone(MAX_TCP_HEADER, sk->sk_allocation);
+               skb = alloc_skb_fclone(MAX_TCP_HEADER,
+                                      sk_gfp_mask(sk, GFP_ATOMIC |
+                                                      __GFP_NOWARN));
                if (unlikely(!skb))
                        return;