Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e35c4c64 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Torvalds
Browse files

initramfs: use time64_t timestamps 

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.

Link: http://lkml.kernel.org/r/20171019095536.801199-1-arnd@arndb.de


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Daniel Thompson <daniel.thompson@linaro.org>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Stafford Horne <shorne@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 44ea3942

init/initramfs.c

+5 −5
Original line number Diff line number Diff line
@@ -109,7 +109,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];
@@ -125,10 +125,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)
@@ -150,7 +150,7 @@ static void __init dir_utime(void) 
	}

}



static __initdata time_t mtime;

static __initdata time64_t mtime;



/* cpio header parsing */
@@ -177,7 +177,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];