1 files changed, 9 insertions, 5 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 854f6d0c4bb3..cbcc9fc47783 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -769,19 +769,23 @@ new_segment:
                                         if (off == PAGE_SIZE) {
                                                 put_page(page);
                                                 TCP_PAGE(sk) = page = NULL;
+                                                TCP_OFF(sk) = off = 0;
                                         }
-                                }
+                                } else
+                                        BUG_ON(off);
+
+                                if (copy > PAGE_SIZE - off)
+                                        copy = PAGE_SIZE - off;
+
+                                if (!sk_stream_wmem_schedule(sk, copy))
+                                        goto wait_for_memory;
 
                                 if (!page) {
                                         /* Allocate new cache page. */
                                         if (!(page = sk_stream_alloc_page(sk)))
                                                 goto wait_for_memory;
-                                        off = 0;
                                 }
 
-                                if (copy > PAGE_SIZE - off)
-                                        copy = PAGE_SIZE - off;
-
                                 /* Time to copy data. We are close to
                                  * the end! */
                                 err = skb_copy_to_page(sk, from, skb, page,