summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-09-30 15:04:42 +0200
committerSasha Levin <sasha.levin@oracle.com>2016-01-21 11:23:29 -0500
commit27327566b15132cfecc1ef056c26ea8ccceabd6e (patch)
tree1b594d1037ffe5b99dc4ad4f6567a507b9f84157
parent33fde5c22c1a352ec56a7500ab94cdfc7574faed (diff)
downloadlwn-27327566b15132cfecc1ef056c26ea8ccceabd6e.tar.gz
lwn-27327566b15132cfecc1ef056c26ea8ccceabd6e.zip
ceph: fix message length computation
[ 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>
-rw-r--r--fs/ceph/mds_client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index a92d3f5c6c12..6f29455c03fe 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -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) *