Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 218ad12f authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Herbert Xu
Browse files

[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: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 8053fc3d

include/net/inet_hashtables.h

+1 −2
Original line number Diff line number Diff line
@@ -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;

	}

}