1 files changed, 6 insertions, 4 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index 5504fb9fa88a..567e468d7492 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1235,14 +1235,16 @@ static inline struct sk_buff *sk_stream_alloc_pskb(struct sock *sk,
                                                    gfp_t gfp)
 {
         struct sk_buff *skb;
-        int hdr_len;
 
-        hdr_len = SKB_DATA_ALIGN(sk->sk_prot->max_header);
-        skb = alloc_skb_fclone(size + hdr_len, gfp);
+        skb = alloc_skb_fclone(size + sk->sk_prot->max_header, gfp);
         if (skb) {
                 skb->truesize += mem;
                 if (sk_stream_wmem_schedule(sk, skb->truesize)) {
-                        skb_reserve(skb, hdr_len);
+                        /*
+                         * Make sure that we have exactly size bytes
+                         * available to the caller, no more, no less.
+                         */
+                        skb_reserve(skb, skb_tailroom(skb) - size);
                         return skb;
                 }
                 __kfree_skb(skb);