Skip to content

Commit

Permalink
ceph: messenger: check return from get_authorizer
Browse files Browse the repository at this point in the history
In prepare_connect_authorizer(), a connection's get_authorizer
method is called but ignores its return value.  This function can
return an error, so check for it and return it if that ever occurs.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
  • Loading branch information
Alex Elder authored and Alex Elder committed May 17, 2012
1 parent b1c6b98 commit ed96af6
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions net/ceph/messenger.c
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,7 @@ static int prepare_connect_authorizer(struct ceph_connection *con)
void *auth_buf;
int auth_len;
int auth_protocol;
int ret;

if (!con->ops->get_authorizer) {
con->out_connect.authorizer_protocol = CEPH_AUTH_UNKNOWN;
Expand All @@ -673,11 +674,14 @@ static int prepare_connect_authorizer(struct ceph_connection *con)
auth_buf = NULL;
auth_len = 0;
auth_protocol = CEPH_AUTH_UNKNOWN;
con->ops->get_authorizer(con, &auth_buf, &auth_len, &auth_protocol,
&con->auth_reply_buf, &con->auth_reply_buf_len,
con->auth_retry);
ret = con->ops->get_authorizer(con, &auth_buf, &auth_len,
&auth_protocol, &con->auth_reply_buf,
&con->auth_reply_buf_len, con->auth_retry);
mutex_lock(&con->mutex);

if (ret)
return ret;

if (test_bit(CLOSED, &con->state) || test_bit(OPENING, &con->state))
return -EAGAIN;

Expand Down

0 comments on commit ed96af6

Please sign in to comment.