---

yaml --- r: 299023 b: refs/heads/master c: 87151b8 h: refs/heads/master i: 299021: c34926d 299019: 824b91e 299015: 296e88d 299007: b54b3d7 v: v3
git-mirror · Apr 11, 2012 · e6d1089 · e6d1089
1 parent 36b6fdc
commit e6d1089
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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.