RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #26803 into master

Browse Source 
* refs/pull/26803/head:
	msg/async/ProtocolV1: fix locking around authorizer_buf

Reviewed-by: Ricardo Dias <rdias@suse.com>
This commit is contained in:
Sage Weil 2019-03-07 16:59:24 -06:00
commit cb59866c46
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/msg/async/ProtocolV1.cc
View File

@ -1827,10 +1827,8 @@ CtPtr ProtocolV1::handle_connect_message_1(char *buffer, int r) {
CtPtr ProtocolV1::wait_connect_message_auth() {
ldout(cct, 20) << __func__ << dendl;
if (!authorizer_buf.length()) {
authorizer_buf.push_back(buffer::create(connect_msg.authorizer_len));
}
authorizer_buf.clear();
authorizer_buf.push_back(buffer::create(connect_msg.authorizer_len));
return READB(connect_msg.authorizer_len, authorizer_buf.c_str(),
handle_connect_message_auth);
}
@ -1914,17 +1912,18 @@ CtPtr ProtocolV1::handle_connect_message_2() {
authorizer_reply);
}
bufferlist auth_bl_copy = authorizer_buf;
connection->lock.unlock();
ldout(cct,10) << __func__ << " authorizor_protocol "
<< connect_msg.authorizer_protocol
<< " len " << authorizer_buf.length()
<< " len " << auth_bl_copy.length()
<< dendl;
bool authorizer_valid;
bool need_challenge = HAVE_FEATURE(connect_msg.features, CEPHX_V2);
bool had_challenge = (bool)authorizer_challenge;
if (!messenger->ms_deliver_verify_authorizer(
connection, connection->peer_type, connect_msg.authorizer_protocol,
authorizer_buf, authorizer_reply, authorizer_valid, session_key,
auth_bl_copy, authorizer_reply, authorizer_valid, session_key,
nullptr /* connection_secret */,
need_challenge ? &authorizer_challenge : nullptr) ||
!authorizer_valid) {