Re: [PATCH] x86/purgatory: Do not use fortified string functions

From: Kees Cook
Date: Thu Jun 01 2023 - 12:51:28 EST


On Thu, Jun 01, 2023 at 09:45:57AM -0700, Dave Hansen wrote:
> On 5/30/23 17:33, Kees Cook wrote:
> > With the addition of -fstrict-flex-arrays=3, struct sha256_state's
> > trailing array is no longer ignored by CONFIG_FORTIFY_SOURCE:
> >
> > struct sha256_state {
> > u32 state[SHA256_DIGEST_SIZE / 4];
> > u64 count;
> > u8 buf[SHA256_BLOCK_SIZE];
> > };
> >
> > This means that the memcpy() calls with "buf" as a destination in
> > sha256.c's code will attempt to perform run-time bounds checking, which
> > could lead to calling missing functions, specifically a potential
> > WARN_ONCE, which isn't callable from purgatory.
> >
> > Reported-by: Thorsten Leemhuis <linux@xxxxxxxxxxxxx>
> > Closes: https://lore.kernel.org/lkml/175578ec-9dec-7a9c-8d3a-43f24ff86b92@xxxxxxxxxxxxx/
> > Bisected-by: "Joan Bruguera Micó" <joanbrugueram@xxxxxxxxx>
> > Fixes: df8fc4e934c1 ("kbuild: Enable -fstrict-flex-arrays=3")
> > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> > Cc: Ingo Molnar <mingo@xxxxxxxxxx>
>
> Hi Folks,
>
> The -fstrict-flex-arrays=3 commit isn't upstream yet, right? That makes

Correct.

> it a _bit_ wonky for us to carry this on the x86 side since among other
> things, the Fixes commit doesn't exist. I'd be fine if this goes up
> along with the -fstrict-flex-arrays=3 code, so:
>
> Acked-by: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>

That would be perfect; thank you! I've added it to my tree.

--
Kees Cook