p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: 540b1c48c3 ("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>
This commit is contained in:
YueHaibing 2018-08-01 13:27:23 +01:00 committed by David S. Miller
parent a94c689e6c
commit c01f6c9b32
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/rxrpc/call_accept.c
View File

@ -116,9 +116,9 @@ static int rxrpc_service_prealloc_one(struct rxrpc_sock *rx,
while (*pp) { while (*pp) {
parent = *pp; parent = *pp;
xcall = rb_entry(parent, struct rxrpc_call, sock_node); 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; 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; pp = &(*pp)->rb_right;
else else
goto id_in_use; goto id_in_use;