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

Commit cc086fcf authored by Ying Xue's avatar Ying Xue Committed by David S. Miller
Browse files

tipc: fix a potential oops 



Commit 6c9808ce ("tipc: remove port_lock") accidentally involves
a potential bug: when tipc socket instance(tsk) is not got with given
reference number in tipc_sk_get(), tsk is set to NULL. Subsequently
we jump to exit label where to decrease socket reference counter
pointed by tsk pointer in tipc_sk_put(). However, As now tsk is NULL,
oops may happen because of touching a NULL pointer.

Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Acked-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Acked-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 574746dd

net/tipc/socket.c

+2 −2
Original line number Diff line number Diff line
@@ -2118,9 +2118,9 @@ static void tipc_sk_timeout(unsigned long ref) 


	tsk = tipc_sk_get(ref);

	if (!tsk)

		goto exit;

	sk = &tsk->sk;

		return;



	sk = &tsk->sk;

	bh_lock_sock(sk);

	if (!tsk->connected) {

		bh_unlock_sock(sk);