From e6d108973d1a5c6d85e6e919687232bc7b4c46a6 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 10 Apr 2012 20:08:39 +0000
Subject: [PATCH] --- yaml --- r: 299023 b: refs/heads/master c:
 87151b8689d890dfb495081f7be9b9e257f7a2df h: refs/heads/master i:   299021:
 c34926d6b9861af4a1ab572b4cddbe7bf7fca3dd   299019:
 824b91eb8f38602a581dd79db05ce4f16f8d162a   299015:
 296e88d16d923eba8545fe4ea58559e3dd4b0ea2   299007:
 b54b3d7783de977fee86ff27b40fa62a289f2ead v: v3

---
 [refs]                  | 2 +-
 trunk/net/core/skbuff.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fa91673ec07b..ab6970281ebf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 996304bbea3d2a094b7ba54c3bd65d3fffeac57b
+refs/heads/master: 87151b8689d890dfb495081f7be9b9e257f7a2df
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index baf8d281152c..e59840010d45 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -952,9 +952,11 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
 		goto adjust_others;
 	}
 
-	data = kmalloc(size + sizeof(struct skb_shared_info), gfp_mask);
+	data = kmalloc(size + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)),
+		       gfp_mask);
 	if (!data)
 		goto nodata;
+	size = SKB_WITH_OVERHEAD(ksize(data));
 
 	/* Copy only real data... and, alas, header. This should be
 	 * optimized for the cases when header is void.