---

yaml --- r: 72974 b: refs/heads/master c: 3f0666e h: refs/heads/master v: v3
git-mirror · Nov 1, 2007 · 0a4846e · 0a4846e
1 parent efebfef
commit 0a4846e
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: c308c1b20e2eb7b13f200a7c18b3f23561318367
+refs/heads/master: 3f0666ee3039443fa7b7cf436dd16ce0dd8e3f95
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
@@ -908,10 +908,12 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority,
 {
 	struct sock *sk;
 
+	if (zero_it)
+		priority |= __GFP_ZERO;
+
 	sk = sk_prot_alloc(prot, priority);
 	if (sk) {
 		if (zero_it) {
-			memset(sk, 0, prot->obj_size);
 			sk->sk_family = family;
 			/*
 			 * See comment in struct sock definition to understand