Commit 938cca9e authored by Tetsuo Handa's avatar Tetsuo Handa Committed by David S. Miller
Browse files

sock: fix /proc/net/sockstat underflow in sk_clone_lock() 



sk_clone_lock() needs to call sock_inuse_add(1) before entering the
sk_free_unlock_clone() error path, for __sk_free() from sk_free() from
sk_free_unlock_clone() calls sock_inuse_add(-1).

Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Fixes: 648845ab ("sock: Move the socket inuse to namespace.")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 271351d2

net/core/sock.c

+3 −3
Original line number Diff line number Diff line
@@ -2124,8 +2124,10 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) 
	newsk->sk_prot_creator = prot;



	/* SANITY */

	if (likely(newsk->sk_net_refcnt))

	if (likely(newsk->sk_net_refcnt)) {

		get_net(sock_net(newsk));

		sock_inuse_add(sock_net(newsk), 1);

	}

	sk_node_init(&newsk->sk_node);

	sock_lock_init(newsk);

	bh_lock_sock(newsk);
@@ -2197,8 +2199,6 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) 
	newsk->sk_err_soft = 0;

	newsk->sk_priority = 0;

	newsk->sk_incoming_cpu = raw_smp_processor_id();

	if (likely(newsk->sk_net_refcnt))

		sock_inuse_add(sock_net(newsk), 1);



	/* Before updating sk_refcnt, we must commit prior changes to memory

	 * (Documentation/RCU/rculist_nulls.rst for details)