diff options
| author | Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 2005-04-19 22:41:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-04-19 22:41:54 -0700 |
| commit | 88a66858253c57334a519a77187234867bc8605c (patch) | |
| tree | 0ed43178152af4eff13943540aa7e4ec9f3658fb /net/core | |
| parent | 9c2b3328f74800bb370d08bb3a4255d5fe833e94 (diff) | |
| download | kernel_samsung_smdk4412-88a66858253c57334a519a77187234867bc8605c.tar.gz kernel_samsung_smdk4412-88a66858253c57334a519a77187234867bc8605c.tar.bz2 kernel_samsung_smdk4412-88a66858253c57334a519a77187234867bc8605c.zip | |
[SOCK]: on failure free the sock from the right place
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/sock.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index f52c87a9268..4df4fa3c5de 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -641,7 +641,10 @@ struct sock *sk_alloc(int family, int priority, struct proto *prot, int zero_it) } if (security_sk_alloc(sk, family, priority)) { - kmem_cache_free(slab, sk); + if (slab != NULL) + kmem_cache_free(slab, sk); + else + kfree(sk); sk = NULL; } else __module_get(prot->owner); |