Skip to contentSkip to conversation

ceph: fix message length computation

PATCH Applied Arnd Bergmann 2 participants 2 messages Sep 30, 2015 – Oct 1, 2015 Ceph client

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ceph: fix message length computation

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")

---

fs/ceph/mds_client.c +1 -1
index 51cb02da75d9..fe2c982764e7 100644
@@ -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) *

_______________________________________________
Y2038 mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/y2038

Applied
#1 lore raw
Quoted 17 lines · Arnd Bergmann

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")

---

fs/ceph/mds_client.c +0 -0
index 51cb02da75d9..fe2c982764e7 100644

fs/ceph/mds_client.c static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc, · line 1941

Quoted 8 lines
fs/ceph/mds_client.c +1 -1
@@ -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) *

Applied. thanks

Yan, Zheng

Quoted 4 lines

--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html