diff options
author | Alex Elder <elder@inktank.com> | 2012-05-16 16:16:38 -0400 |
---|---|---|
committer | Alex Elder <elder@dreamhost.com> | 2012-05-17 09:18:12 -0400 |
commit | ed96af646011412c2bf1ffe860db170db355fae5 (patch) | |
tree | 17c491072634a955087f71cfc020ea0fb3ea9382 /net | |
parent | b1c6b9803f5491e94041e6da96bc9dec3870e792 (diff) |
ceph: messenger: check return from get_authorizer
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/ceph/messenger.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 09409a3d9500..e0532d5b22f5 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c | |||
@@ -658,6 +658,7 @@ static int prepare_connect_authorizer(struct ceph_connection *con) | |||
658 | void *auth_buf; | 658 | void *auth_buf; |
659 | int auth_len; | 659 | int auth_len; |
660 | int auth_protocol; | 660 | int auth_protocol; |
661 | int ret; | ||
661 | 662 | ||
662 | if (!con->ops->get_authorizer) { | 663 | if (!con->ops->get_authorizer) { |
663 | con->out_connect.authorizer_protocol = CEPH_AUTH_UNKNOWN; | 664 | con->out_connect.authorizer_protocol = CEPH_AUTH_UNKNOWN; |
@@ -673,11 +674,14 @@ static int prepare_connect_authorizer(struct ceph_connection *con) | |||
673 | auth_buf = NULL; | 674 | auth_buf = NULL; |
674 | auth_len = 0; | 675 | auth_len = 0; |
675 | auth_protocol = CEPH_AUTH_UNKNOWN; | 676 | auth_protocol = CEPH_AUTH_UNKNOWN; |
676 | con->ops->get_authorizer(con, &auth_buf, &auth_len, &auth_protocol, | 677 | ret = con->ops->get_authorizer(con, &auth_buf, &auth_len, |
677 | &con->auth_reply_buf, &con->auth_reply_buf_len, | 678 | &auth_protocol, &con->auth_reply_buf, |
678 | con->auth_retry); | 679 | &con->auth_reply_buf_len, con->auth_retry); |
679 | mutex_lock(&con->mutex); | 680 | mutex_lock(&con->mutex); |
680 | 681 | ||
682 | if (ret) | ||
683 | return ret; | ||
684 | |||
681 | if (test_bit(CLOSED, &con->state) || test_bit(OPENING, &con->state)) | 685 | if (test_bit(CLOSED, &con->state) || test_bit(OPENING, &con->state)) |
682 | return -EAGAIN; | 686 | return -EAGAIN; |
683 | 687 | ||