All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3] initramfs: Check timestamp to prevent broken cpio archive
@ 2021-10-12 20:12 Nicolas Schier
  2021-10-13  1:57 ` Masahiro Yamada
  0 siblings, 1 reply; 2+ messages in thread
From: Nicolas Schier @ 2021-10-12 20:12 UTC (permalink / raw)
  To: Masahiro Yamada, linux-kernel, linux-kbuild
  Cc: Nicolas Schier, Thomas Kühnel

Cpio format reserves 8 bytes for an ASCII representation of a time_t timestamp.
While 2106-02-07 06:28:15 UTC (time_t = 0xffffffff) is still some years in the
future, a poorly chosen date string for KBUILD_BUILD_TIMESTAMP, converted into
seconds since the epoch, might lead to exceeded cpio timestamp limits that
result in a broken cpio archive.  Add timestamp checks to prevent overrun of
the 8-byte cpio header field.

My colleague Thomas Kühnel discovered the behaviour, when we accidentally fed
SOURCE_DATE_EPOCH to KBUILD_BUILD_TIMESTAMP as is: some timestamps (e.g.
1607420928 = 2021-12-08 9:48:48 UTC) will be interpreted by `date` as a valid
date specification of science fictional times (here: year 160742).  Even though
this is bad input for KBUILD_BUILD_TIMESTAMP, it should not break the initramfs
cpio format.

Signed-off-by: Nicolas Schier <nicolas@fjasle.eu>
Cc: Thomas Kühnel <thomas.kuehnel@avm.de>
---
 usr/gen_init_cpio.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
index 03b21189d58b..97aeeecf7386 100644
--- a/usr/gen_init_cpio.c
+++ b/usr/gen_init_cpio.c
@@ -320,6 +320,12 @@ static int cpio_mkfile(const char *name, const char *location,
 		goto error;
 	}
 
+	if (buf.st_mtime > 0xffffffff) {
+		fprintf(stderr, "%s: Timestamp exceeds maximum cpio timestamp, clipping.\n",
+			location);
+		buf.st_mtime = 0xffffffff;
+	}
+
 	filebuf = malloc(buf.st_size);
 	if (!filebuf) {
 		fprintf (stderr, "out of memory\n");
@@ -551,6 +557,16 @@ 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.
+	 */
+	if (default_mtime > 0xffffffff) {
+		fprintf(stderr, "ERROR: Timestamp too large for cpio format\n");
+		exit(1);
+	}
+
 	if (argc - optind != 1) {
 		usage(argv[0]);
 		exit(1);
-- 
2.30.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v3] initramfs: Check timestamp to prevent broken cpio archive
  2021-10-12 20:12 [PATCH v3] initramfs: Check timestamp to prevent broken cpio archive Nicolas Schier
@ 2021-10-13  1:57 ` Masahiro Yamada
  0 siblings, 0 replies; 2+ messages in thread
From: Masahiro Yamada @ 2021-10-13  1:57 UTC (permalink / raw)
  To: Nicolas Schier
  Cc: Linux Kernel Mailing List, Linux Kbuild mailing list, Thomas Kühnel

On Wed, Oct 13, 2021 at 5:12 AM Nicolas Schier <nicolas@fjasle.eu> wrote:
>
> Cpio format reserves 8 bytes for an ASCII representation of a time_t timestamp.
> While 2106-02-07 06:28:15 UTC (time_t = 0xffffffff) is still some years in the
> future, a poorly chosen date string for KBUILD_BUILD_TIMESTAMP, converted into
> seconds since the epoch, might lead to exceeded cpio timestamp limits that
> result in a broken cpio archive.  Add timestamp checks to prevent overrun of
> the 8-byte cpio header field.
>
> My colleague Thomas Kühnel discovered the behaviour, when we accidentally fed
> SOURCE_DATE_EPOCH to KBUILD_BUILD_TIMESTAMP as is: some timestamps (e.g.
> 1607420928 = 2021-12-08 9:48:48 UTC) will be interpreted by `date` as a valid
> date specification of science fictional times (here: year 160742).  Even though
> this is bad input for KBUILD_BUILD_TIMESTAMP, it should not break the initramfs
> cpio format.
>
> Signed-off-by: Nicolas Schier <nicolas@fjasle.eu>
> Cc: Thomas Kühnel <thomas.kuehnel@avm.de>
> ---

Applied to linux-kbuild. Thanks.



>  usr/gen_init_cpio.c | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
>
> diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
> index 03b21189d58b..97aeeecf7386 100644
> --- a/usr/gen_init_cpio.c
> +++ b/usr/gen_init_cpio.c
> @@ -320,6 +320,12 @@ static int cpio_mkfile(const char *name, const char *location,
>                 goto error;
>         }
>
> +       if (buf.st_mtime > 0xffffffff) {
> +               fprintf(stderr, "%s: Timestamp exceeds maximum cpio timestamp, clipping.\n",
> +                       location);
> +               buf.st_mtime = 0xffffffff;
> +       }
> +
>         filebuf = malloc(buf.st_size);
>         if (!filebuf) {
>                 fprintf (stderr, "out of memory\n");
> @@ -551,6 +557,16 @@ 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.
> +        */
> +       if (default_mtime > 0xffffffff) {
> +               fprintf(stderr, "ERROR: Timestamp too large for cpio format\n");
> +               exit(1);
> +       }
> +
>         if (argc - optind != 1) {
>                 usage(argv[0]);
>                 exit(1);
> --
> 2.30.1
>


-- 
Best Regards
Masahiro Yamada

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-10-13  1:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-12 20:12 [PATCH v3] initramfs: Check timestamp to prevent broken cpio archive Nicolas Schier
2021-10-13  1:57 ` Masahiro Yamada

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.