libceph: message signature support

Signed-off-by: Yan, Zheng <zyan@redhat.com>

1 files changed, 29 insertions, 3 deletions

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 863d07ab2129..33a2f201e460 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -1196,8 +1196,18 @@ static void prepare_write_message_footer(struct ceph_connection *con)
         dout("prepare_write_message_footer %p\n", con);
         con->out_kvec_is_msg = true;
         con->out_kvec[v].iov_base = &m->footer;
-        con->out_kvec[v].iov_len = sizeof(m->footer);
-        con->out_kvec_bytes += sizeof(m->footer);
+        if (con->peer_features & CEPH_FEATURE_MSG_AUTH) {
+                if (con->ops->sign_message)
+                        con->ops->sign_message(con, m);
+                else
+                        m->footer.sig = 0;
+                con->out_kvec[v].iov_len = sizeof(m->footer);
+                con->out_kvec_bytes += sizeof(m->footer);
+        } else {
+                m->old_footer.flags = m->footer.flags;
+                con->out_kvec[v].iov_len = sizeof(m->old_footer);
+                con->out_kvec_bytes += sizeof(m->old_footer);
+        }
         con->out_kvec_left++;
         con->out_more = m->more_to_follow;
         con->out_msg_done = true;
@@ -2249,6 +2259,7 @@ static int read_partial_message(struct ceph_connection *con)
         int ret;
         unsigned int front_len, middle_len, data_len;
         bool do_datacrc = !con->msgr->nocrc;
+        bool need_sign = (con->peer_features & CEPH_FEATURE_MSG_AUTH);
         u64 seq;
         u32 crc;
 
@@ -2361,12 +2372,21 @@ static int read_partial_message(struct ceph_connection *con)
         }
 
         /* footer */
-        size = sizeof (m->footer);
+        if (need_sign)
+                size = sizeof(m->footer);
+        else
+                size = sizeof(m->old_footer);
+
         end += size;
         ret = read_partial(con, end, size, &m->footer);
         if (ret <= 0)
                 return ret;
 
+        if (!need_sign) {
+                m->footer.flags = m->old_footer.flags;
+                m->footer.sig = 0;
+        }
+
         dout("read_partial_message got msg %p %d (%u) + %d (%u) + %d (%u)\n",
              m, front_len, m->footer.front_crc, middle_len,
              m->footer.middle_crc, data_len, m->footer.data_crc);
@@ -2390,6 +2410,12 @@ static int read_partial_message(struct ceph_connection *con)
                 return -EBADMSG;
         }
 
+        if (need_sign && con->ops->check_message_signature &&
+            con->ops->check_message_signature(con, m)) {
+                pr_err("read_partial_message %p signature check failed\n", m);
+                return -EBADMSG;
+        }
+
         return 1; /* done! */
 }