Skip to contentSkip to conversation

KMSAN: fix memset() when using fortify-source, again

PATCH Applied Arnd Bergmann 3 participants 4 messages Jun 18 – Sep 3 FORTIFY_SOURCE

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 KMSAN: fix memset() when using fortify-source, again

From: Arnd Bergmann <[email protected]>

Both kmsan and fortify-source replace the memset function. When both are enabled at the same time, the kmsan version gets used, which triggers a warning about fortify-source being nonfunctional:

warning: unsafe memset() usage lacked '__write_overflow' symbol in /home/arnd/arm-soc/lib/test_fortify/write_overflow-memset.c
warning: unsafe memset() usage lacked '__write_overflow_field' symbol in /home/arnd/arm-soc/lib/test_fortify/write_overflow_field-memset.c

Commit 78a498c3a227 already tried to address this, but this seems to only have worked for memcpy() and memmove() but not memset(), which is still lacking the macro definition when KMSAN is enabled.

Remove the incorrect #ifndef check around the memset() macro.

Fixes ff901d80fff6 ("x86: kmsan: use __msan_ string functions where possible.")
Fixes 78a498c3a227 ("x86: fortify: kmsan: fix KMSAN fortify builds")

---
The patch passes randconfig builds on x86/arm/arm64/s390 for me, but please double-check all the corner cases, as it's still possible that the #ifndef is required to work around a runtime issue that I did not test.

---
 include/linux/fortify-string.h | 2 --
 1 file changed, 2 deletions(-)
include/linux/fortify-string.h +0 -2
index 5541c75ab852..5eddaefc61bd 100644
@@ -506,10 +506,8 @@ __FORTIFY_INLINE bool fortify_memset_chk(__kernel_size_t size,
  * __struct_size() vs __member_size() must be captured here to avoid
  * evaluating argument side-effects further into the macro layers.
  */
-#ifndef CONFIG_KMSAN
 #define memset(p, c, s) __fortify_memset_chk(p, c, s,			\
 		__struct_size(p), __member_size(p))
-#endif
 
 /*
  * To make sure the compiler can enforce protection against buffer overflows,
Signature · 1 line
2.39.5
maintainer
#1 lore raw
Quoted 6 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

Both kmsan and fortify-source replace the memset function. When both are enabled at the same time, the kmsan version gets used, which triggers a warning about fortify-source being nonfunctional:

Quoted 8 lines

warning: unsafe memset() usage lacked '__write_overflow' symbol in /home/arnd/arm-soc/lib/test_fortify/write_overflow-memset.c
warning: unsafe memset() usage lacked '__write_overflow_field' symbol in /home/arnd/arm-soc/lib/test_fortify/write_overflow_field-memset.c

Commit 78a498c3a227 already tried to address this, but this seems to only have worked for memcpy() and memmove() but not memset(), which is still lacking the macro definition when KMSAN is enabled.

Remove the incorrect #ifndef check around the memset() macro.

Ah, nice find.

Quoted 9 lines
Fixes ff901d80fff6 ("x86: kmsan: use __msan_ string functions where possible.")
Fixes 78a498c3a227 ("x86: fortify: kmsan: fix KMSAN fortify builds")

---
The patch passes randconfig builds on x86/arm/arm64/s390 for me, but please double-check all the corner cases, as it's still possible that the #ifndef is required to work around a runtime issue that I did not test.

How about I drop this into -next right after -rc2 and we can see what falls out of it?

-Kees

Signature · 1 line
Kees Cook
#2 lore raw
Quoted 10 lines · Kees Cook
Quoted 8 lines · Arnd Bergmann
Fixes ff901d80fff6 ("x86: kmsan: use __msan_ string functions where possible.")
Fixes 78a498c3a227 ("x86: fortify: kmsan: fix KMSAN fortify builds")

---
The patch passes randconfig builds on x86/arm/arm64/s390 for me, but please double-check all the corner cases, as it's still possible that the #ifndef is required to work around a runtime issue that I did not test.

Quoted 2 lines

How about I drop this into -next right after -rc2 and we can see what falls out of it?

Sounds good, thanks!

Arnd

maintainer Applied
#3 lore raw
In reply to Arnd Bergmann
Quoted 8 lines · Arnd Bergmann

Both kmsan and fortify-source replace the memset function. When both are enabled at the same time, the kmsan version gets used, which triggers a warning about fortify-source being nonfunctional:

warning: unsafe memset() usage lacked '__write_overflow' symbol in /home/arnd/arm-soc/lib/test_fortify/write_overflow-memset.c
warning: unsafe memset() usage lacked '__write_overflow_field' symbol in /home/arnd/arm-soc/lib/test_fortify/write_overflow_field-memset.c

[...]

Applied to for-next/hardening, thanks!

[1/1] KMSAN: fix memset() when using fortify-source, again

      https://git.kernel.org/kees/c/ff936b726c98

Take care,

Signature · 1 line
Kees Cook