| From 777d738a5e58ba3b6f3932ab1543ce93703f4873 Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Wed, 30 Sep 2015 15:04:42 +0200 |
| Subject: ceph: fix message length computation |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| commit 777d738a5e58ba3b6f3932ab1543ce93703f4873 upstream. |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/ceph/mds_client.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/fs/ceph/mds_client.c |
| +++ b/fs/ceph/mds_client.c |
| @@ -1905,7 +1905,7 @@ static struct ceph_msg *create_request_m |
| |
| 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) * |
