Skip to content

Commit

Permalink
initramfs: Check negative timestamp to prevent broken cpio archive
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Andrew Donnellan <[email protected]>
Tested-by: Andrew Donnellan <[email protected]>
Signed-off-by: Masahiro Yamada <[email protected]>
  • Loading branch information
BenjaminGrayNp1 authored and masahir0y committed Apr 16, 2023
1 parent aa7d233 commit 5efb685
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions usr/gen_init_cpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,12 @@ static int cpio_mkfile(const char *name, const char *location,
buf.st_mtime = 0xffffffff;
}

if (buf.st_mtime < 0) {
fprintf(stderr, "%s: Timestamp negative, clipping.\n",
location);
buf.st_mtime = 0;
}

if (buf.st_size > 0xffffffff) {
fprintf(stderr, "%s: Size exceeds maximum cpio file size\n",
location);
Expand Down Expand Up @@ -602,10 +608,10 @@ int main (int argc, char *argv[])
/*
* Timestamps after 2106-02-07 06:28:15 UTC have an ascii hex time_t
* representation that exceeds 8 chars and breaks the cpio header
* specification.
* specification. Negative timestamps similarly exceed 8 chars.
*/
if (default_mtime > 0xffffffff) {
fprintf(stderr, "ERROR: Timestamp too large for cpio format\n");
if (default_mtime > 0xffffffff || default_mtime < 0) {
fprintf(stderr, "ERROR: Timestamp out of range for cpio format\n");
exit(1);
}

Expand Down

0 comments on commit 5efb685

Please sign in to comment.