diff options
| author |   YueHaibing <yuehaibing@huawei.com> | 2018-08-01 13:27:23 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-08-01 11:49:49 -0700 |
| commit | c01f6c9b3207e52fc9973a066a856ddf7a0538d8 (patch) | |
| tree | 829bd9ab350898aa030f3a1be318ce38b884024e /net/rxrpc | |
| parent | net: dsa: Do not suspend/resume closed slave_dev (diff) | |
| download | linux-dev-c01f6c9b3207e52fc9973a066a856ddf7a0538d8.tar.xz linux-dev-c01f6c9b3207e52fc9973a066a856ddf7a0538d8.zip | |
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: 540b1c48c37a ("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>
Diffstat (limited to 'net/rxrpc')
| -rw-r--r-- | net/rxrpc/call_accept.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/call_accept.c b/net/rxrpc/call_accept.c index a9a9be5519b9..9d1e298b784c 100644 --- a/net/rxrpc/call_accept.c +++ b/net/rxrpc/call_accept.c @@ -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; |