1 files changed, 20 insertions, 17 deletions

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index cb7ca569052c..412a920fe0ec 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2296,7 +2296,7 @@ void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss,
                 return;
 
         if (tcp_write_xmit(sk, cur_mss, nonagle, 0,
-                           sk_gfp_atomic(sk, GFP_ATOMIC)))
+                           sk_gfp_mask(sk, GFP_ATOMIC)))
                 tcp_check_probe_timer(sk);
 }
 
@@ -3150,7 +3150,7 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn)
 {
         struct tcp_sock *tp = tcp_sk(sk);
         struct tcp_fastopen_request *fo = tp->fastopen_req;
-        int syn_loss = 0, space, err = 0, copied;
+        int syn_loss = 0, space, err = 0;
         unsigned long last_syn_loss = 0;
         struct sk_buff *syn_data;
 
@@ -3188,17 +3188,18 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn)
                 goto fallback;
         syn_data->ip_summed = CHECKSUM_PARTIAL;
         memcpy(syn_data->cb, syn->cb, sizeof(syn->cb));
-        copied = copy_from_iter(skb_put(syn_data, space), space,
-                                &fo->data->msg_iter);
-        if (unlikely(!copied)) {
-                kfree_skb(syn_data);
-                goto fallback;
-        }
-        if (copied != space) {
-                skb_trim(syn_data, copied);
-                space = copied;
+        if (space) {
+                int copied = copy_from_iter(skb_put(syn_data, space), space,
+                                            &fo->data->msg_iter);
+                if (unlikely(!copied)) {
+                        kfree_skb(syn_data);
+                        goto fallback;
+                }
+                if (copied != space) {
+                        skb_trim(syn_data, copied);
+                        space = copied;
+                }
         }
-
         /* No more data pending in inet_wait_for_connect() */
         if (space == fo->size)
                 fo->data = NULL;
@@ -3352,8 +3353,9 @@ void tcp_send_ack(struct sock *sk)
          * tcp_transmit_skb() will set the ownership to this
          * sock.
          */
-        buff = alloc_skb(MAX_TCP_HEADER, sk_gfp_atomic(sk, GFP_ATOMIC));
-        if (!buff) {
+        buff = alloc_skb(MAX_TCP_HEADER,
+                         sk_gfp_mask(sk, GFP_ATOMIC | __GFP_NOWARN));
+        if (unlikely(!buff)) {
                 inet_csk_schedule_ack(sk);
                 inet_csk(sk)->icsk_ack.ato = TCP_ATO_MIN;
                 inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
@@ -3375,7 +3377,7 @@ void tcp_send_ack(struct sock *sk)
 
         /* Send it off, this clears delayed acks for us. */
         skb_mstamp_get(&buff->skb_mstamp);
-        tcp_transmit_skb(sk, buff, 0, sk_gfp_atomic(sk, GFP_ATOMIC));
+        tcp_transmit_skb(sk, buff, 0, (__force gfp_t)0);
 }
 EXPORT_SYMBOL_GPL(tcp_send_ack);
 
@@ -3396,7 +3398,8 @@ static int tcp_xmit_probe_skb(struct sock *sk, int urgent, int mib)
         struct sk_buff *skb;
 
         /* We don't queue it, tcp_transmit_skb() sets ownership. */
-        skb = alloc_skb(MAX_TCP_HEADER, sk_gfp_atomic(sk, GFP_ATOMIC));
+        skb = alloc_skb(MAX_TCP_HEADER,
+                        sk_gfp_mask(sk, GFP_ATOMIC | __GFP_NOWARN));
         if (!skb)
                 return -1;
 
@@ -3409,7 +3412,7 @@ static int tcp_xmit_probe_skb(struct sock *sk, int urgent, int mib)
         tcp_init_nondata_skb(skb, tp->snd_una - !urgent, TCPHDR_ACK);
         skb_mstamp_get(&skb->skb_mstamp);
         NET_INC_STATS(sock_net(sk), mib);
-        return tcp_transmit_skb(sk, skb, 0, GFP_ATOMIC);
+        return tcp_transmit_skb(sk, skb, 0, (__force gfp_t)0);
 }
 
 void tcp_send_window_probe(struct sock *sk)