Skip to content

Commit 91218d7

Browse files
committed
x86/purgatory: Do not use fortified string functions
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 <[email protected]> Closes: https://lore.kernel.org/lkml/[email protected]/ Bisected-by: "Joan Bruguera Micó" <[email protected]> Fixes: df8fc4e ("kbuild: Enable -fstrict-flex-arrays=3") Cc: Thomas Gleixner <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Dave Hansen <[email protected]> Cc: [email protected] Cc: "H. Peter Anvin" <[email protected]> Cc: Nick Desaulniers <[email protected]> Cc: Masahiro Yamada <[email protected]> Cc: "Peter Zijlstra (Intel)" <[email protected]> Cc: Alyssa Ross <[email protected]> Cc: Sami Tolvanen <[email protected]> Cc: Alexander Potapenko <[email protected]> Signed-off-by: Kees Cook <[email protected]> Tested-by: Thorsten Leemhuis <[email protected]> Acked-by: Dave Hansen <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 41e7a72 commit 91218d7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/purgatory/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ $(obj)/string.o: $(srctree)/arch/x86/boot/compressed/string.c FORCE
1212
$(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE
1313
$(call if_changed_rule,cc_o_c)
1414

15-
CFLAGS_sha256.o := -D__DISABLE_EXPORTS
15+
CFLAGS_sha256.o := -D__DISABLE_EXPORTS -D__NO_FORTIFY
1616

1717
# When linking purgatory.ro with -r unresolved symbols are not checked,
1818
# also link a purgatory.chk binary without -r to check for unresolved symbols.

0 commit comments

Comments
 (0)