Commit 91a4a3eb authored Nov 28, 2019 by Tung Nguyen Committed by David S. Miller Nov 28, 2019

tipc: fix wrong socket reference counter after tipc_sk_timeout() returns



When tipc_sk_timeout() is executed but user space is grabbing
ownership, this function rearms itself and returns. However, the
socket reference counter is not reduced. This causes potential
unexpected behavior.

This commit fixes it by calling sock_put() before tipc_sk_timeout()
returns in the above-mentioned case.

Fixes: afe8792f ("tipc: refactor function tipc_sk_timeout()")
Signed-off-by: Tung Nguyen <tung.q.nguyen@dektech.com.au>
Acked-by: Ying Xue <ying.xue@windriver.com>
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2fe97a57

net/tipc/socket.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2759,6 +2759,7 @@ static void tipc_sk_timeout(struct timer_list *t)
		if (sock_owned_by_user(sk)) {
		sk_reset_timer(sk, &sk->sk_timer, jiffies + HZ / 20);
		bh_unlock_sock(sk);
		sock_put(sk);
		return;
		}

Admin message