[PATCH] initramfs: use time64_t timestamps

From: Arnd Bergmann
Date: Thu Oct 19 2017 - 05:55:48 EST


The cpio format uses a 32-bit number to encode file timestamps,
which breaks initramfs support in 2038. This reinterprets the
timestamp as unsigned, to give us another 68 years and avoids
breaking until 2106.

Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
---
init/initramfs.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/init/initramfs.c b/init/initramfs.c
index e64bf7b4c1ca..53aa2d0a53d4 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -108,7 +108,7 @@ static void __init free_hash(void)
}
}

-static long __init do_utime(char *filename, time_t mtime)
+static long __init do_utime(char *filename, time64_t mtime)
{
struct timespec64 t[2];

@@ -124,10 +124,10 @@ static __initdata LIST_HEAD(dir_list);
struct dir_entry {
struct list_head list;
char *name;
- time_t mtime;
+ time64_t mtime;
};

-static void __init dir_add(const char *name, time_t mtime)
+static void __init dir_add(const char *name, time64_t mtime)
{
struct dir_entry *de = kmalloc(sizeof(struct dir_entry), GFP_KERNEL);
if (!de)
@@ -149,7 +149,7 @@ static void __init dir_utime(void)
}
}

-static __initdata time_t mtime;
+static __initdata time64_t mtime;

/* cpio header parsing */

@@ -176,7 +176,7 @@ static void __init parse_header(char *s)
uid = parsed[2];
gid = parsed[3];
nlink = parsed[4];
- mtime = parsed[5];
+ mtime = parsed[5]; /* breaks in y2106 */
body_len = parsed[6];
major = parsed[7];
minor = parsed[8];
--
2.9.0