Commit 2e70aedd authored May 03, 2015 by Herbert Xu Committed by David S. Miller May 04, 2015

Revert "net: kernel socket should be released in init_net namespace"



This reverts commit c243d7e2.

That patch is solving a non-existant problem while creating a
real problem.  Just because a socket is allocated in the init
name space doesn't mean that it gets hashed in the init name space.

When we unhash it the name space must be the same as the one
we had when we hashed it.  So this patch is completely bogus
and causes socket leaks.

Reported-by: Andrey Wagin <avagin@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent bd4d95a5

net/core/sock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1474,8 +1474,8 @@ void sk_release_kernel(struct sock *sk)
		return;

		sock_hold(sk);
		sock_net_set(sk, get_net(&init_net));
		sock_release(sk->sk_socket);
		sock_net_set(sk, get_net(&init_net));
		sock_put(sk);
		}
		EXPORT_SYMBOL(sk_release_kernel);

Admin message