Skip to content

Commit 5efb685

Browse files
BenjaminGrayNp1masahir0y
authored andcommitted
initramfs: Check negative timestamp to prevent broken cpio archive
Similar to commit 4c9d410 ("initramfs: Check timestamp to prevent broken cpio archive"), except asserts that the timestamp is non-negative. This can happen when the KBUILD_BUILD_TIMESTAMP is a value before UNIX epoch, which may be set when making reproducible builds that don't want to look like they use a valid date. While support for dates before 1970 might not be supported, this is more about preventing undetected CPIO corruption. The printf's use a minimum length format specifier, and will happily make the field longer than 8 characters if they need to. Signed-off-by: Benjamin Gray <bgray@linux.ibm.com> Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com> Tested-by: Andrew Donnellan <ajd@linux.ibm.com> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
1 parent aa7d233 commit 5efb685

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

usr/gen_init_cpio.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,12 @@ static int cpio_mkfile(const char *name, const char *location,
353353
buf.st_mtime = 0xffffffff;
354354
}
355355

356+
if (buf.st_mtime < 0) {
357+
fprintf(stderr, "%s: Timestamp negative, clipping.\n",
358+
location);
359+
buf.st_mtime = 0;
360+
}
361+
356362
if (buf.st_size > 0xffffffff) {
357363
fprintf(stderr, "%s: Size exceeds maximum cpio file size\n",
358364
location);
@@ -602,10 +608,10 @@ int main (int argc, char *argv[])
602608
/*
603609
* Timestamps after 2106-02-07 06:28:15 UTC have an ascii hex time_t
604610
* representation that exceeds 8 chars and breaks the cpio header
605-
* specification.
611+
* specification. Negative timestamps similarly exceed 8 chars.
606612
*/
607-
if (default_mtime > 0xffffffff) {
608-
fprintf(stderr, "ERROR: Timestamp too large for cpio format\n");
613+
if (default_mtime > 0xffffffff || default_mtime < 0) {
614+
fprintf(stderr, "ERROR: Timestamp out of range for cpio format\n");
609615
exit(1);
610616
}
611617

0 commit comments

Comments
 (0)