diff --git a/[refs] b/[refs] index 1bbcd5fe3ec8..d4e4c0f47034 100644 --- 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 index 6ee2ed104a83..b66f607fcb96 100644 --- 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