Fix memory leak in inet_hashtables.h when NUMA is on
Subsystems (2)
PATCH 1/1 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.
---
include/net/inet_hashtables.h +1 -2
@@ -186,9 +186,8 @@ static inline void inet_ehash_locks_free(struct inet_hashinfo *hashinfo)if (size >PAGE_SIZE )vfree (hashinfo->ehash_locks); else -#else -kfree (hashinfo->ehash_locks);#endif +kfree (hashinfo->ehash_locks); hashinfo->ehash_locks =NULL ; } }
Quoted 23 lines · Pavel Emelyanov
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_SIZEwe leak the pointer (kfree is inside the #else branch).
Quoted 7 lines
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 <[email protected]>
Good catch! Applied to net-2.6. Thanks.
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt