ceph: fix use after free on mds __unregister_request

[pandora-kernel.git] / fs / ceph / auth.c

diff --git a/fs/ceph/auth.c b/fs/ceph/auth.c
index 32f2e2a..abb204f 100644 (file)
--- a/fs/ceph/auth.c
+++ b/fs/ceph/auth.c
@@ -5,6 +5,7 @@
 
 #include "types.h"
 #include "auth_none.h"
+#include "auth_x.h"
 #include "decode.h"
 #include "super.h"
 
@@ -14,7 +15,8 @@
  * get protocol handler
  */
 static u32 supported_protocols[] = {
-       CEPH_AUTH_NONE
+       CEPH_AUTH_NONE,
+       CEPH_AUTH_CEPHX
 };
 
 int ceph_auth_init_protocol(struct ceph_auth_client *ac, int protocol)
@@ -22,6 +24,8 @@ int ceph_auth_init_protocol(struct ceph_auth_client *ac, int protocol)
        switch (protocol) {
        case CEPH_AUTH_NONE:
                return ceph_auth_none_init(ac);
+       case CEPH_AUTH_CEPHX:
+               return ceph_x_init(ac);
        default:
                return -ENOENT;
        }
@@ -107,8 +111,11 @@ int ceph_auth_build_hello(struct ceph_auth_client *ac, void *buf, size_t len)
        lenp = p;
        p += sizeof(u32);
 
+       ceph_decode_need(&p, end, 1 + sizeof(u32), bad);
+       ceph_encode_8(&p, 1);
        num = ARRAY_SIZE(supported_protocols);
        ceph_encode_32(&p, num);
+       ceph_decode_need(&p, end, num * sizeof(u32), bad);
        for (i = 0; i < num; i++)
                ceph_encode_32(&p, supported_protocols[i]);
 
@@ -125,6 +132,30 @@ bad:
        return -ERANGE;
 }
 
+int ceph_build_auth_request(struct ceph_auth_client *ac,
+                          void *msg_buf, size_t msg_len)
+{
+       struct ceph_mon_request_header *monhdr = msg_buf;
+       void *p = monhdr + 1;
+       void *end = msg_buf + msg_len;
+       int ret;
+
+       monhdr->have_version = 0;
+       monhdr->session_mon = cpu_to_le16(-1);
+       monhdr->session_mon_tid = 0;
+
+       ceph_encode_32(&p, ac->protocol);
+
+       ret = ac->ops->build_request(ac, p + sizeof(u32), end);
+       if (ret < 0) {
+               pr_err("error %d building request\n", ret);
+               return ret;
+       }
+       dout(" built request %d bytes\n", ret);
+       ceph_encode_32(&p, ret);
+       return p + ret - msg_buf;
+}
+
 /*
  * Handle auth message from monitor.
  */
@@ -188,28 +219,13 @@ int ceph_handle_auth_reply(struct ceph_auth_client *ac,
                                goto out;
                        }
                }
+
+               ac->negotiating = false;
        }
 
        ret = ac->ops->handle_reply(ac, result, payload, payload_end);
        if (ret == -EAGAIN) {
-               struct ceph_mon_request_header *monhdr = reply_buf;
-               void *p = reply_buf + 1;
-               void *end = reply_buf + reply_len;
-
-               monhdr->have_version = 0;
-               monhdr->session_mon = cpu_to_le16(-1);
-               monhdr->session_mon_tid = 0;
-
-               ceph_encode_32(&p, ac->protocol);
-
-               ret = ac->ops->build_request(ac, p + sizeof(u32), end);
-               if (ret < 0) {
-                       pr_err("error %d building request\n", ret);
-                       goto out;
-               }
-               dout(" built request %d bytes\n", ret);
-               ceph_encode_32(&p, ret);
-               return p + ret - reply_buf;
+               return ceph_build_auth_request(ac, reply_buf, reply_len);
        } else if (ret) {
                pr_err("authentication error %d\n", ret);
                return ret;
@@ -222,4 +238,20 @@ out:
        return ret;
 }
 
+int ceph_build_auth(struct ceph_auth_client *ac,
+                   void *msg_buf, size_t msg_len)
+{
+       if (!ac->protocol)
+               return ceph_auth_build_hello(ac, msg_buf, msg_len);
+       BUG_ON(!ac->ops);
+       if (!ac->ops->is_authenticated(ac))
+               return ceph_build_auth_request(ac, msg_buf, msg_len);
+       return 0;
+}
 
+int ceph_auth_is_authenticated(struct ceph_auth_client *ac)
+{
+       if (!ac->ops)
+               return 0;
+       return ac->ops->is_authenticated(ac);
+}