1 files changed, 9 insertions, 4 deletions

diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h
index 9575a52e011f..379f71508995 100644
--- a/include/linux/ceph/decode.h
+++ b/include/linux/ceph/decode.h
@@ -154,14 +154,19 @@ bad:
 static inline void ceph_decode_timespec(struct timespec *ts,
                                         const struct ceph_timespec *tv)
 {
-        ts->tv_sec = le32_to_cpu(tv->tv_sec);
-        ts->tv_nsec = le32_to_cpu(tv->tv_nsec);
+        ts->tv_sec = (__kernel_time_t)le32_to_cpu(tv->tv_sec);
+        ts->tv_nsec = (long)le32_to_cpu(tv->tv_nsec);
 }
 static inline void ceph_encode_timespec(struct ceph_timespec *tv,
                                         const struct timespec *ts)
 {
-        tv->tv_sec = cpu_to_le32(ts->tv_sec);
-        tv->tv_nsec = cpu_to_le32(ts->tv_nsec);
+        BUG_ON(ts->tv_sec < 0);
+        BUG_ON(ts->tv_sec > (__kernel_time_t)U32_MAX);
+        BUG_ON(ts->tv_nsec < 0);
+        BUG_ON(ts->tv_nsec > (long)U32_MAX);
+
+        tv->tv_sec = cpu_to_le32((u32)ts->tv_sec);
+        tv->tv_nsec = cpu_to_le32((u32)ts->tv_nsec);
 }
 
 /*