Commit 3f0666ee authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller

[NET]: Auto-zero the allocated sock object

We have a __GFP_ZERO flag that allocates a zeroed chunk of memory.
Use it in the sk_alloc() and avoid a hand-made memset().

This is a temporary patch that will help us in the nearest future :)
Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c308c1b2
...@@ -908,10 +908,12 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority, ...@@ -908,10 +908,12 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority,
{ {
struct sock *sk; struct sock *sk;
if (zero_it)
priority |= __GFP_ZERO;
sk = sk_prot_alloc(prot, priority); sk = sk_prot_alloc(prot, priority);
if (sk) { if (sk) {
if (zero_it) { if (zero_it) {
memset(sk, 0, prot->obj_size);
sk->sk_family = family; sk->sk_family = family;
/* /*
* See comment in struct sock definition to understand * See comment in struct sock definition to understand
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment