* [PATCH] s390/purgatory: Do not use fortified string functions
@ 2023-05-31 0:34 Kees Cook
2023-05-31 14:33 ` Nathan Chancellor
2023-06-01 16:58 ` Kees Cook
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-05-31 0:34 UTC (permalink / raw)
To: Heiko Carstens
Cc: Kees Cook, Thorsten Leemhuis, Joan Bruguera Micó,
Vasily Gorbik, Alexander Gordeev, Christian Borntraeger,
Sven Schnelle, Masahiro Yamada, Linux Kernel Functional Testing,
Nathan Chancellor, Gustavo A. R. Silva, linux-s390, linux-kernel,
linux-hardening
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@leemhuis.info>
Closes: https://lore.kernel.org/lkml/175578ec-9dec-7a9c-8d3a-43f24ff86b92@leemhuis.info/
Bisected-by: "Joan Bruguera Micó" <joanbrugueram@gmail.com>
Fixes: df8fc4e934c1 ("kbuild: Enable -fstrict-flex-arrays=3")
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Linux Kernel Functional Testing <lkft@linaro.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: linux-s390@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
arch/s390/purgatory/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile
index 32573b4f9bd2..cf14740abd1c 100644
--- a/arch/s390/purgatory/Makefile
+++ b/arch/s390/purgatory/Makefile
@@ -10,7 +10,7 @@ PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y))
$(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE
$(call if_changed_rule,cc_o_c)
-CFLAGS_sha256.o := -D__DISABLE_EXPORTS
+CFLAGS_sha256.o := -D__DISABLE_EXPORTS -D__NO_FORTIFY
$(obj)/mem.o: $(srctree)/arch/s390/lib/mem.S FORCE
$(call if_changed_rule,as_o_S)
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] s390/purgatory: Do not use fortified string functions
2023-05-31 0:34 [PATCH] s390/purgatory: Do not use fortified string functions Kees Cook
@ 2023-05-31 14:33 ` Nathan Chancellor
2023-06-01 16:58 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Nathan Chancellor @ 2023-05-31 14:33 UTC (permalink / raw)
To: Kees Cook
Cc: Heiko Carstens, Thorsten Leemhuis, Joan Bruguera Micó,
Vasily Gorbik, Alexander Gordeev, Christian Borntraeger,
Sven Schnelle, Masahiro Yamada, Linux Kernel Functional Testing,
Gustavo A. R. Silva, linux-s390, linux-kernel, linux-hardening
On Tue, May 30, 2023 at 05:34:15PM -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@leemhuis.info>
> Closes: https://lore.kernel.org/lkml/175578ec-9dec-7a9c-8d3a-43f24ff86b92@leemhuis.info/
> Bisected-by: "Joan Bruguera Micó" <joanbrugueram@gmail.com>
> Fixes: df8fc4e934c1 ("kbuild: Enable -fstrict-flex-arrays=3")
> Cc: Heiko Carstens <hca@linux.ibm.com>
> Cc: Vasily Gorbik <gor@linux.ibm.com>
> Cc: Alexander Gordeev <agordeev@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
> Cc: Sven Schnelle <svens@linux.ibm.com>
> Cc: Masahiro Yamada <masahiroy@kernel.org>
> Cc: Linux Kernel Functional Testing <lkft@linaro.org>
> Cc: Nathan Chancellor <nathan@kernel.org>
> Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
> Cc: linux-s390@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reading https://lore.kernel.org/202305301658.BF6ECF65C@keescook/ was
some good additional context.
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
> ---
> arch/s390/purgatory/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile
> index 32573b4f9bd2..cf14740abd1c 100644
> --- a/arch/s390/purgatory/Makefile
> +++ b/arch/s390/purgatory/Makefile
> @@ -10,7 +10,7 @@ PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y))
> $(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE
> $(call if_changed_rule,cc_o_c)
>
> -CFLAGS_sha256.o := -D__DISABLE_EXPORTS
> +CFLAGS_sha256.o := -D__DISABLE_EXPORTS -D__NO_FORTIFY
>
> $(obj)/mem.o: $(srctree)/arch/s390/lib/mem.S FORCE
> $(call if_changed_rule,as_o_S)
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] s390/purgatory: Do not use fortified string functions
2023-05-31 0:34 [PATCH] s390/purgatory: Do not use fortified string functions Kees Cook
2023-05-31 14:33 ` Nathan Chancellor
@ 2023-06-01 16:58 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2023-06-01 16:58 UTC (permalink / raw)
To: keescook, hca
Cc: svens, gustavoars, agordeev, linux, gor, borntraeger, linux-s390,
nathan, linux-hardening, masahiroy, lkft, joanbrugueram,
linux-kernel
On Tue, 30 May 2023 17:34:15 -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];
> };
>
> [...]
Applied to for-next/hardening, thanks!
[1/1] s390/purgatory: Do not use fortified string functions
https://git.kernel.org/kees/c/d11f44513655
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-01 16:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-31 0:34 [PATCH] s390/purgatory: Do not use fortified string functions Kees Cook
2023-05-31 14:33 ` Nathan Chancellor
2023-06-01 16:58 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).