1 files changed, 12 insertions, 8 deletions

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index d5718284db57..7e71b0df1fbc 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -2058,6 +2058,8 @@ static int process_connect(struct ceph_connection *con)
         dout("process_connect on %p tag %d\n", con, (int)con->in_tag);
 
         if (con->auth) {
+                int len = le32_to_cpu(con->in_reply.authorizer_len);
+
                 /*
                  * Any connection that defines ->get_authorizer()
                  * should also define ->add_authorizer_challenge() and
@@ -2067,8 +2069,7 @@ static int process_connect(struct ceph_connection *con)
                  */
                 if (con->in_reply.tag == CEPH_MSGR_TAG_CHALLENGE_AUTHORIZER) {
                         ret = con->ops->add_authorizer_challenge(
-                                    con, con->auth->authorizer_reply_buf,
-                                    le32_to_cpu(con->in_reply.authorizer_len));
+                                    con, con->auth->authorizer_reply_buf, len);
                         if (ret < 0)
                                 return ret;
 
@@ -2078,10 +2079,12 @@ static int process_connect(struct ceph_connection *con)
                         return 0;
                 }
 
-                ret = con->ops->verify_authorizer_reply(con);
-                if (ret < 0) {
-                        con->error_msg = "bad authorize reply";
-                        return ret;
+                if (len) {
+                        ret = con->ops->verify_authorizer_reply(con);
+                        if (ret < 0) {
+                                con->error_msg = "bad authorize reply";
+                                return ret;
+                        }
                 }
         }
 
@@ -3206,9 +3209,10 @@ void ceph_con_keepalive(struct ceph_connection *con)
         dout("con_keepalive %p\n", con);
         mutex_lock(&con->mutex);
         clear_standby(con);
+        con_flag_set(con, CON_FLAG_KEEPALIVE_PENDING);
         mutex_unlock(&con->mutex);
-        if (con_flag_test_and_set(con, CON_FLAG_KEEPALIVE_PENDING) == 0 &&
-            con_flag_test_and_set(con, CON_FLAG_WRITE_PENDING) == 0)
+
+        if (con_flag_test_and_set(con, CON_FLAG_WRITE_PENDING) == 0)
                 queue_con(con);
 }
 EXPORT_SYMBOL(ceph_con_keepalive);