diff options
| author | Alex Elder <elder@inktank.com> | 2012-05-16 15:16:38 -0500 |
|---|---|---|
| committer | Alex Elder <elder@dreamhost.com> | 2012-05-17 08:18:12 -0500 |
| commit | ed96af646011412c2bf1ffe860db170db355fae5 (patch) | |
| tree | 17c491072634a955087f71cfc020ea0fb3ea9382 /net/ceph | |
| parent | b1c6b9803f5491e94041e6da96bc9dec3870e792 (diff) | |
| download | op-kernel-dev-ed96af646011412c2bf1ffe860db170db355fae5.zip op-kernel-dev-ed96af646011412c2bf1ffe860db170db355fae5.tar.gz | |
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/ceph')
| -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 09409a3..e0532d5 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -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; @@ -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; |
