ceph: messenger: check return from get_authorizer

(cherry picked from commit ed96af646011412c2bf1ffe860db170db355fae5)

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 09409a3d95000984860f5738da4c6e0d83f3f971..e0532d5b22f5f4783ec129047543a727c7180b07 100644 (file)
--- 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;