ceph: fix decoding of client session messages flags

The cephfs kernel client started to show  the message:

 ceph: mds0 session blocklisted

when mounting a filesystem.  This is due to the fact that the session
messages are being incorrectly decoded: the skip needs to take into
account the 'len'.

While there, fixed some whitespaces too.

Cc: stable@vger.kernel.org
Fixes: e1c9788cb397 ("ceph: don't rely on error_string to validate blocklisted session.")
Signed-off-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index e9eb996e0aee0e557d4d88fab8bdeddbb9748e34..f5d110d90b77044bdb43a9265fe39620c69f5069 100644 (file)
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -3425,13 +3425,17 @@ static void handle_session(struct ceph_mds_session *session,
        }
 
        if (msg_version >= 5) {
-               u32 flags;
-               /* version >= 4, struct_v, struct_cv, len, metric_spec */
-               ceph_decode_skip_n(&p, end, 2 + sizeof(u32) * 2, bad);
+               u32 flags, len;
+
+               /* version >= 4 */
+               ceph_decode_skip_16(&p, end, bad); /* struct_v, struct_cv */
+               ceph_decode_32_safe(&p, end, len, bad); /* len */
+               ceph_decode_skip_n(&p, end, len, bad); /* metric_spec */
+
                /* version >= 5, flags   */
-                ceph_decode_32_safe(&p, end, flags, bad);
+               ceph_decode_32_safe(&p, end, flags, bad);
                if (flags & CEPH_SESSION_BLOCKLISTED) {
-                       pr_warn("mds%d session blocklisted\n", session->s_mds);
+                       pr_warn("mds%d session blocklisted\n", session->s_mds);
                        blocklisted = true;
                }
        }