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

[Conor Dooley]

Hey Kees,

On Tue, May 30, 2023 at 05:34:04PM -0700, 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 at leemhuis.info>
> Closes: https://lore.kernel.org/lkml/175578ec-9dec-7a9c-8d3a-43f24ff86b92@leemhuis.info/
> Bisected-by: "Joan Bruguera Micó" <joanbrugueram at gmail.com>
> Fixes: df8fc4e934c1 ("kbuild: Enable -fstrict-flex-arrays=3")
> Cc: Paul Walmsley <paul.walmsley at sifive.com>
> Cc: Palmer Dabbelt <palmer at dabbelt.com>
> Cc: Albert Ou <aou at eecs.berkeley.edu>
> Cc: Masahiro Yamada <masahiroy at kernel.org>
> Cc: Conor Dooley <conor.dooley at microchip.com>
> Cc: Nick Desaulniers <ndesaulniers at google.com>
> Cc: Alyssa Ross <hi at alyssa.is>
> Cc: Heiko Stuebner <heiko.stuebner at vrull.eu>
> Cc: "Gustavo A. R. Silva" <gustavoars at kernel.org>
> Cc: linux-riscv at lists.infradead.org
> Signed-off-by: Kees Cook <keescook at chromium.org>

Perhaps this is indicative of other issues in RISC-V land, but
allmodconfig complains about this patch:

../lib/string.c:17: warning: "__NO_FORTIFY" redefined
../lib/string.c:17:9: warning: preprocessor token __NO_FORTIFY redefined

> ---
>  arch/riscv/purgatory/Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile
> index 5730797a6b40..11f4c275f141 100644
> --- a/arch/riscv/purgatory/Makefile
> +++ b/arch/riscv/purgatory/Makefile
> @@ -31,9 +31,9 @@ $(obj)/strncmp.o: $(srctree)/arch/riscv/lib/strncmp.S FORCE
>  $(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE
>  	$(call if_changed_rule,cc_o_c)
>  
> -CFLAGS_sha256.o := -D__DISABLE_EXPORTS
> -CFLAGS_string.o := -D__DISABLE_EXPORTS
> -CFLAGS_ctype.o := -D__DISABLE_EXPORTS
> +CFLAGS_sha256.o := -D__DISABLE_EXPORTS -D__NO_FORTIFY
> +CFLAGS_string.o := -D__DISABLE_EXPORTS -D__NO_FORTIFY
> +CFLAGS_ctype.o := -D__DISABLE_EXPORTS -D__NO_FORTIFY
>  
>  # When linking purgatory.ro with -r unresolved symbols are not checked,
>  # also link a purgatory.chk binary without -r to check for unresolved symbols.
> -- 
> 2.34.1
> 
> 
> _______________________________________________
> linux-riscv mailing list
> linux-riscv at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-riscv/attachments/20230531/26837db8/attachment.sig>