]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ceph: fix message length computation
authorArnd Bergmann <arnd@arndb.de>
Wed, 30 Sep 2015 13:04:42 +0000 (15:04 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Mon, 2 Nov 2015 22:36:47 +0000 (23:36 +0100)
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>
fs/ceph/mds_client.c

index 51cb02da75d98979b18e05d7bdad4dee89e258d4..fe2c982764e78d5f0ec2b82dab49f6b6fbe83237 100644 (file)
@@ -1935,7 +1935,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) *