Skip to content

Commit

Permalink
ceph: fix message length computation
Browse files Browse the repository at this point in the history
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: b8e6906 ("ceph: include time stamp in every MDS request")
Signed-off-by: Arnd Bergmann <[email protected]>
Signed-off-by: Yan, Zheng <[email protected]>
  • Loading branch information
arndb authored and idryomov committed Nov 2, 2015
1 parent 1291fb9 commit 777d738
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/ceph/mds_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) *
Expand Down

0 comments on commit 777d738

Please sign in to comment.