Commit c01f6c9b authored Aug 01, 2018 by YueHaibing Committed by David S. Miller Aug 01, 2018

rxrpc: Fix user call ID check in rxrpc_service_prealloc_one



There just check the user call ID isn't already in use, hence should
compare user_call_ID with xcall->user_call_ID, which is current
node's user_call_ID.

Fixes: 540b1c48 ("rxrpc: Fix deadlock between call creation and sendmsg/recvmsg")
Suggested-by: David Howells <dhowells@redhat.com>
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a94c689e

net/rxrpc/call_accept.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -116,9 +116,9 @@ static int rxrpc_service_prealloc_one(struct rxrpc_sock *rx,
		while (*pp) {
		parent = *pp;
		xcall = rb_entry(parent, struct rxrpc_call, sock_node);
		if (user_call_ID < call->user_call_ID)
		if (user_call_ID < xcall->user_call_ID)
		pp = &(*pp)->rb_left;
		else if (user_call_ID > call->user_call_ID)
		else if (user_call_ID > xcall->user_call_ID)
		pp = &(*pp)->rb_right;
		else
		goto id_in_use;