]> git.hungrycats.org Git - linux/commitdiff
ceph: fix message length computation
authorArnd Bergmann <arnd@arndb.de>
Wed, 30 Sep 2015 13:04:42 +0000 (15:04 +0200)
committerSasha Levin <sasha.levin@oracle.com>
Thu, 21 Jan 2016 16:23:29 +0000 (11:23 -0500)
[ Upstream commit 777d738a5e58ba3b6f3932ab1543ce93703f4873 ]

create_request_message() computes the maximum length of a message,
but uses the wrong type for the time stamp: sizeof(struct timespec)
may be 8 or 16 depending on the architecture, while sizeof(struct
ceph_timespec) is always 8, and that is what gets put into the
message.

Found while auditing the uses of timespec for y2038 problems.

Fixes: b8e69066d8af ("ceph: include time stamp in every MDS request")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
fs/ceph/mds_client.c

index a92d3f5c6c12fa3ae0b7308c9fcd379ac821cc67..6f29455c03fe69e53f4ded43bad84304fbc79a2f 100644 (file)
@@ -1857,7 +1857,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc,
 
        len = sizeof(*head) +
                pathlen1 + pathlen2 + 2*(1 + sizeof(u32) + sizeof(u64)) +
-               sizeof(struct timespec);
+               sizeof(struct ceph_timespec);
 
        /* calculate (max) length for cap releases */
        len += sizeof(struct ceph_mds_request_release) *