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

Commit f943aeb0 authored by Cong Wang's avatar Cong Wang Committed by Greg Kroah-Hartman
Browse files

tipc: use lock_sock() in tipc_sk_reinit() 



[ Upstream commit 15ef70e286176165d28b0b8a969b422561a68dfc ]

lock_sock() must be used in process context to be race-free with
other lock_sock() callers, for example, tipc_release(). Otherwise
using the spinlock directly can't serialize a parallel tipc_release().

As it is blocking, we have to hold the sock refcnt before
rhashtable_walk_stop() and release it after rhashtable_walk_start().

Fixes: 07f6c4bc ("tipc: convert tipc reference table to use generic rhashtable")
Reported-by: default avatarDmitry Vyukov <dvyukov@google.com>
Cc: Ying Xue <ying.xue@windriver.com>
Cc: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 08264146

net/tipc/socket.c

+6 −2
Original line number Diff line number Diff line
@@ -2261,11 +2261,15 @@ void tipc_sk_reinit(struct net *net) 
			goto walk_stop;



		while ((tsk = rhashtable_walk_next(&iter)) && !IS_ERR(tsk)) {

			spin_lock_bh(&tsk->sk.sk_lock.slock);

			sock_hold(&tsk->sk);

			rhashtable_walk_stop(&iter);

			lock_sock(&tsk->sk);

			msg = &tsk->phdr;

			msg_set_prevnode(msg, tn->own_addr);

			msg_set_orignode(msg, tn->own_addr);

			spin_unlock_bh(&tsk->sk.sk_lock.slock);

			release_sock(&tsk->sk);

			rhashtable_walk_start(&iter);

			sock_put(&tsk->sk);

		}

walk_stop:

		rhashtable_walk_stop(&iter);