]> err.no Git - linux-2.6/commit
[IPV4]: Fix memory leak in inet_hashtables.h when NUMA is on
authorPavel Emelyanov <xemul@openvz.org>
Mon, 26 Nov 2007 12:23:31 +0000 (20:23 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 26 Nov 2007 12:23:31 +0000 (20:23 +0800)
commit218ad12f42e0b6207105cde8fd13017d1ed449e4
tree2f79b20a20ccfeeea1f44b82d9ec2ef0eb2758de
parent8053fc3de720e1027d690f892ff7d7c1737fdd9d
[IPV4]: Fix memory leak in inet_hashtables.h when NUMA is on

The inet_ehash_locks_alloc() looks like this:

#ifdef CONFIG_NUMA
if (size > PAGE_SIZE)
x = vmalloc(...);
else
#endif
x = kmalloc(...);

Unlike it, the inet_ehash_locks_alloc() looks like this:

#ifdef CONFIG_NUMA
if (size > PAGE_SIZE)
vfree(x);
else
#else
kfree(x);
#endif

The error is obvious - if the NUMA is on and the size
is less than the PAGE_SIZE we leak the pointer (kfree is
inside the #else branch).

Compiler doesn't warn us because after the kfree(x) there's
a "x = NULL" assignment, so here's another (minor?) bug: we
don't set x to NULL under certain circumstances.

Boring explanation, I know... Patch explains it better.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
include/net/inet_hashtables.h