kasan: test: use underlying string helpers
PATCH 1/2 kasan: test: use underlying string helpers
From: Arnd Bergmann <[email protected]>
Calling memcmp() and memchr() with an intentional buffer overflow is now caught at compile time:
In function 'memcmp',
inlined from 'kasan_memcmp' at lib/test_kasan.c:897:2:include/linux/fortify-string.h:263:25: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter)
263 | __read_overflow();
| ^~~~~~~~~~~~~~~~~
In function 'memchr',
inlined from 'kasan_memchr' at lib/test_kasan.c:872:2:
include/linux/fortify-string.h:277:17: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter)
277 | __read_overflow();
| ^~~~~~~~~~~~~~~~~Change the kasan tests to wrap those inside of a noinline function to prevent the compiler from noticing the bug and let kasan find it at runtime.
--- lib/test_kasan.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
lib/test_kasan.c +17 -2
@@ -852,6 +852,21 @@ static void kmem_cache_invalid_free(struct kunit *test)kmem_cache_destroy (cache); } +/* +* noinline wrappers to prevent the compiler from noticing the overflow +* at compile time rather than having kasan catch it. +* */ +static noinline void *__kasan_memchr(const void *s, int c, size_t n) +{ +return memchr (s, c, n); +} + +static noinline int __kasan_memcmp(const void *s1, const void *s2, size_t n) +{ +return memcmp (s1, s2, n); +} + +static void kasan_memchr (struct kunit *test) {char *ptr;
@@ -870,7 +885,7 @@ static void kasan_memchr(struct kunit *test)KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr);KUNIT_EXPECT_KASAN_FAIL (test, - kasan_ptr_result =memchr (ptr,'1' , size +1 )); + kasan_ptr_result =__kasan_memchr (ptr,'1' , size +1 ));kfree (ptr); }
@@ -895,7 +910,7 @@ static void kasan_memcmp(struct kunit *test)memset (arr,0 ,sizeof (arr));KUNIT_EXPECT_KASAN_FAIL (test, - kasan_int_result =memcmp (ptr, arr, size+1 )); + kasan_int_result =__kasan_memcmp (ptr, arr, size+1 ));kfree (ptr); }
Signature · 1 line
2.29.2
PATCH 2/2 kasan: use fortified strings for hwaddress sanitizer
From: Arnd Bergmann <[email protected]>
GCC has separate macros for -fsanitize=kernel-address and -fsanitize=kernel-hwaddress, and the check in the arm64 string.h gets this wrong, which leads to string functions not getting fortified with gcc. The newly added tests find this:
warning: unsafe memchr() usage lacked '__read_overflow' warning in /git/arm-soc/lib/test_fortify/read_overflow-memchr.c
warning: unsafe memchr_inv() usage lacked '__read_overflow' symbol in /git/arm-soc/lib/test_fortify/read_overflow-memchr_inv.c
warning: unsafe memcmp() usage lacked '__read_overflow' warning in /git/arm-soc/lib/test_fortify/read_overflow-memcmp.c
warning: unsafe memscan() usage lacked '__read_overflow' symbol in /git/arm-soc/lib/test_fortify/read_overflow-memscan.c
warning: unsafe memcmp() usage lacked '__read_overflow2' warning in /git/arm-soc/lib/test_fortify/read_overflow2-memcmp.c
warning: unsafe memcpy() usage lacked '__read_overflow2' symbol in /git/arm-soc/lib/test_fortify/read_overflow2-memcpy.c
warning: unsafe memmove() usage lacked '__read_overflow2' symbol in /git/arm-soc/lib/test_fortify/read_overflow2-memmove.c
warning: unsafe memcpy() usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-memcpy.c
warning: unsafe memmove() usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-memmove.c
warning: unsafe memset() usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-memset.c
warning: unsafe strcpy() usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strcpy-lit.c
warning: unsafe strcpy() usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strcpy.c
warning: unsafe strlcpy() usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strlcpy-src.c
warning: unsafe strlcpy() usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strlcpy.c
warning: unsafe strncpy() usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strncpy-src.c
warning: unsafe strncpy() usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strncpy.c
warning: unsafe strscpy() usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strscpy.c
Add a workaround to include/linux/compiler_types.h so we always define __SANITIZE_ADDRESS__ for either mode, as we already do for clang.
--- include/linux/compiler_types.h | 7 +++++++ 1 file changed, 7 insertions(+)
include/linux/compiler_types.h +7 -0
@@ -178,6 +178,13 @@ struct ftrace_likely_data {*/ #define noinline_for_stack noinline +/* +* Treat __SANITIZE_HWADDRESS__ the same as __SANITIZE_ADDRESS__ in the kernel +*/ +#ifdef __SANITIZE_HWADDRESS__ +#define __SANITIZE_ADDRESS__ +#endif +/* * Sanitizer helper attributes: Because using __always_inline and * __no_sanitize_* conflict, provide helper attributes that will either expand
Signature · 1 line
2.29.2
Re: [PATCH 2/2] kasan: use fortified strings for hwaddress sanitizer
Quoted 16 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
GCC has separate macros for -fsanitize=kernel-address and -fsanitize=kernel-hwaddress, and the check in the arm64
string.hgets this wrong, which leads to string functions not getting fortified with gcc. The newly added tests find this:warning: unsafe
memchr()usage lacked '__read_overflow' warning in /git/arm-soc/lib/test_fortify/read_overflow-memchr.c
warning: unsafememchr_inv()usage lacked '__read_overflow' symbol in /git/arm-soc/lib/test_fortify/read_overflow-memchr_inv.c
warning: unsafememcmp()usage lacked '__read_overflow' warning in /git/arm-soc/lib/test_fortify/read_overflow-memcmp.c
warning: unsafememscan()usage lacked '__read_overflow' symbol in /git/arm-soc/lib/test_fortify/read_overflow-memscan.c
warning: unsafememcmp()usage lacked '__read_overflow2' warning in /git/arm-soc/lib/test_fortify/read_overflow2-memcmp.c
warning: unsafememcpy()usage lacked '__read_overflow2' symbol in /git/arm-soc/lib/test_fortify/read_overflow2-memcpy.c
warning: unsafememmove()usage lacked '__read_overflow2' symbol in /git/arm-soc/lib/test_fortify/read_overflow2-memmove.c
warning: unsafememcpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-memcpy.c
warning: unsafememmove()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-memmove.c
Quoted 9 lines
warning: unsafe
memset()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-memset.c
warning: unsafestrcpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strcpy-lit.c
warning: unsafestrcpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strcpy.c
warning: unsafestrlcpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strlcpy-src.c
warning: unsafestrlcpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strlcpy.c
warning: unsafestrncpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strncpy-src.c
warning: unsafestrncpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strncpy.c
warning: unsafestrscpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strscpy.c
What is the build config that trips these warnings?
In trying to understand this, I see in arch/arm64/include/asm/string.h:
#if (defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)) && \
!defined(__SANITIZE_ADDRESS__)other architectures (like arm32) do:
#if defined(CONFIG_KASAN) && !defined(__SANITIZE_ADDRESS__)
so it's okay because it's not getting touched by the hwaddress sanitizer? e.g. I see:
config CC_HAS_KASAN_GENERIC
def_bool $(cc-option, -fsanitize=kernel-address)
config CC_HAS_KASAN_SW_TAGS
def_bool $(cc-option, -fsanitize=kernel-hwaddress)
Quoted 3 lines
Add a workaround to
include/linux/compiler_types.hso we always define__SANITIZE_ADDRESS__for either mode, as we already do for clang.
Where is the clang work-around? (Or is this a statement that clang, under -fsanitize=kernel-hwaddress, already sets __SANITIZE_ADDRESS__ by default?
Quoted 11 lines
Signed-off-by Arnd Bergmann <[email protected]>--- include/linux/compiler_types.h | 7 +++++++ 1 file changed, 7 insertions(+)include/linux/compiler_types.h +0
-0
include/linux/compiler_types.h struct ftrace_likely_data { · line 186
Quoted 9 lines
include/linux/compiler_types.h +6
-0@@ -178,6 +178,13 @@ struct ftrace_likely_data {*/ #define noinline_for_stack noinline +/* +* Treat __SANITIZE_HWADDRESS__ the same as __SANITIZE_ADDRESS__ in the kernel +*/ +#ifdef __SANITIZE_HWADDRESS__ +#define __SANITIZE_ADDRESS__ +#endif
Should this go into compiler-gcc.h instead?
Quoted 7 lines
include/linux/compiler_types.h +1
-0+/* * Sanitizer helper attributes: Because using __always_inline and * __no_sanitize_* conflict, provide helper attributes that will either expand Signature · 1 line
2.29.2
Signature · 1 line
Kees Cook
Re: [PATCH 2/2] kasan: use fortified strings for hwaddress sanitizer
Quoted 28 lines · Kees Cook
Quoted 16 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
GCC has separate macros for -fsanitize=kernel-address and -fsanitize=kernel-hwaddress, and the check in the arm64
string.hgets this wrong, which leads to string functions not getting fortified with gcc. The newly added tests find this:warning: unsafe
memchr()usage lacked '__read_overflow' warning in /git/arm-soc/lib/test_fortify/read_overflow-memchr.c
warning: unsafememchr_inv()usage lacked '__read_overflow' symbol in /git/arm-soc/lib/test_fortify/read_overflow-memchr_inv.c
warning: unsafememcmp()usage lacked '__read_overflow' warning in /git/arm-soc/lib/test_fortify/read_overflow-memcmp.c
warning: unsafememscan()usage lacked '__read_overflow' symbol in /git/arm-soc/lib/test_fortify/read_overflow-memscan.c
warning: unsafememcmp()usage lacked '__read_overflow2' warning in /git/arm-soc/lib/test_fortify/read_overflow2-memcmp.c
warning: unsafememcpy()usage lacked '__read_overflow2' symbol in /git/arm-soc/lib/test_fortify/read_overflow2-memcpy.c
warning: unsafememmove()usage lacked '__read_overflow2' symbol in /git/arm-soc/lib/test_fortify/read_overflow2-memmove.c
warning: unsafememcpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-memcpy.c
warning: unsafememmove()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-memmove.cQuoted 9 lines
warning: unsafe
memset()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-memset.c
warning: unsafestrcpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strcpy-lit.c
warning: unsafestrcpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strcpy.c
warning: unsafestrlcpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strlcpy-src.c
warning: unsafestrlcpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strlcpy.c
warning: unsafestrncpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strncpy-src.c
warning: unsafestrncpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strncpy.c
warning: unsafestrscpy()usage lacked '__write_overflow' symbol in /git/arm-soc/lib/test_fortify/write_overflow-strscpy.c
Quoted 1 line
What is the build config that trips these warnings?
It's a randconfig build, I've uploaded one .config to
https://pastebin.com/raw/4TKB9mhs,
but I have other ones if you can't reproduce with that one.
Quoted 8 lines
In trying to understand this, I see in
arch/arm64/include/asm/string.h:#if (defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)) && \ !defined(__SANITIZE_ADDRESS__)other architectures (like arm32) do:
#if
defined(CONFIG_KASAN)&& !defined(__SANITIZE_ADDRESS__)
Yes, that is exactly the thing that goes wrong. With clang, __SANITIZE_ADDRESS__ gets set here, but gcc sets __SANITIZE_HWADDRESS__ instead
for CONFIG_KASAN_SW_TAGS, so the condition is always true.
Quoted 7 lines
Quoted 3 lines
Add a workaround to
include/linux/compiler_types.hso we always define__SANITIZE_ADDRESS__for either mode, as we already do for clang.Where is the clang work-around? (Or is this a statement that clang, under -fsanitize=kernel-hwaddress, already sets
__SANITIZE_ADDRESS__by default?
I mean this snippet:
#if __has_feature(address_sanitizer) || __has_feature(hwaddress_sanitizer) /* Emulate GCC's __SANITIZE_ADDRESS__ flag */
#define __SANITIZE_ADDRESS__
#endif
Without that, clang sets neither __SANITIZE_ADDRESS__ nor __SANITIZE_HWADDRESS__
Quoted 8 lines
Quoted 8 lines
include/linux/compiler_types.h +0
-0@@ -178,6 +178,13 @@ struct ftrace_likely_data {*/ #define noinline_for_stack noinline
Quoted 8 lines
include/linux/compiler_types.h struct ftrace_likely_data { · line 186
Quoted 6 lines
include/linux/compiler_types.h +6
-0+/* +* Treat __SANITIZE_HWADDRESS__ the same as __SANITIZE_ADDRESS__ in the kernel +*/ +#ifdef __SANITIZE_HWADDRESS__ +#define __SANITIZE_ADDRESS__ +#endif Should this go into
compiler-gcc.hinstead?
Yes, that might be clearer, but the effect is the same, as no other compiler defines
those macros.
Arnd
Quoted 16 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Calling
memcmp()andmemchr()with an intentional buffer overflow is now caught at compile time:In function 'memcmp',
inlined from 'kasan_memcmp' atlib/test_kasan.c:897:2:include/linux/fortify-string.h:263:25: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter)263 | __read_overflow(); | ^~~~~~~~~~~~~~~~~ In function 'memchr', inlined from 'kasan_memchr' at lib/test_kasan.c:872:2: include/linux/fortify-string.h:277:17: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter) 277 | __read_overflow(); | ^~~~~~~~~~~~~~~~~
Quoted 5 lines
Change the kasan tests to wrap those inside of a noinline function to prevent the compiler from noticing the bug and let kasan find it at runtime.
Signed-off-by Arnd Bergmann <[email protected]>
Quoted 49 lines
--- lib/test_kasan.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)lib/test_kasan.c +17
-2@@ -852,6 +852,21 @@ static void kmem_cache_invalid_free(struct kunit *test)kmem_cache_destroy (cache); } +/* +* noinline wrappers to prevent the compiler from noticing the overflow +* at compile time rather than having kasan catch it. +* */ +static noinline void *__kasan_memchr(const void *s, int c, size_t n) +{ +return memchr (s, c, n); +} + +static noinline int __kasan_memcmp(const void *s1, const void *s2, size_t n) +{ +return memcmp (s1, s2, n); +} + +static void kasan_memchr (struct kunit *test) {char *ptr;@@ -870,7 +885,7 @@ static void kasan_memchr(struct kunit *test)KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr);KUNIT_EXPECT_KASAN_FAIL (test, - kasan_ptr_result =memchr (ptr,'1' , size +1 )); + kasan_ptr_result =__kasan_memchr (ptr,'1' , size +1 ));kfree (ptr); }@@ -895,7 +910,7 @@ static void kasan_memcmp(struct kunit *test)memset (arr,0 ,sizeof (arr));KUNIT_EXPECT_KASAN_FAIL (test, - kasan_int_result =memcmp (ptr, arr, size+1 )); + kasan_int_result =__kasan_memcmp (ptr, arr, size+1 ));kfree (ptr); }
Signature · 2 lines
Regards, Vincenzo
Quoted 19 lines · Vincenzo Frascino
Quoted 16 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Calling
memcmp()andmemchr()with an intentional buffer overflow is now caught at compile time:In function 'memcmp',
inlined from 'kasan_memcmp' atlib/test_kasan.c:897:2:include/linux/fortify-string.h:263:25: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter)263 | __read_overflow(); | ^~~~~~~~~~~~~~~~~ In function 'memchr', inlined from 'kasan_memchr' at lib/test_kasan.c:872:2: include/linux/fortify-string.h:277:17: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter) 277 | __read_overflow(); | ^~~~~~~~~~~~~~~~~
Quoted 7 lines
Quoted 5 lines
Change the kasan tests to wrap those inside of a noinline function to prevent the compiler from noticing the bug and let kasan find it at runtime.
Signed-off-by Arnd Bergmann <[email protected]>Reviewed-by Vincenzo Frascino <[email protected]>
How about just explicitly making the size invisible to the compiler?
I did this for similar issues in the same source:
https://lore.kernel.org/linux-hardening/[email protected]/T/#u
-Kees
Quoted 51 lines
Quoted 50 lines
--- lib/test_kasan.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)lib/test_kasan.c +17
-2@@ -852,6 +852,21 @@ static void kmem_cache_invalid_free(struct kunit *test)kmem_cache_destroy (cache); } +/* +* noinline wrappers to prevent the compiler from noticing the overflow +* at compile time rather than having kasan catch it. +* */ +static noinline void *__kasan_memchr(const void *s, int c, size_t n) +{ +return memchr (s, c, n); +} + +static noinline int __kasan_memcmp(const void *s1, const void *s2, size_t n) +{ +return memcmp (s1, s2, n); +} + +static void kasan_memchr (struct kunit *test) {char *ptr;@@ -870,7 +885,7 @@ static void kasan_memchr(struct kunit *test)KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr);KUNIT_EXPECT_KASAN_FAIL (test, - kasan_ptr_result =memchr (ptr,'1' , size +1 )); + kasan_ptr_result =__kasan_memchr (ptr,'1' , size +1 ));kfree (ptr); }@@ -895,7 +910,7 @@ static void kasan_memcmp(struct kunit *test)memset (arr,0 ,sizeof (arr));KUNIT_EXPECT_KASAN_FAIL (test, - kasan_int_result =memcmp (ptr, arr, size+1 )); + kasan_int_result =__kasan_memcmp (ptr, arr, size+1 ));kfree (ptr); }
Signature · 1 line
Kees Cook
Andrew Morton
maintainerQuoted 28 lines · On Thu, 14 Oct 2021 19:40:45 -0700 Kees Cook <[email protected]> wrote:
Quoted 25 lines · Vincenzo Frascino
Quoted 21 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Calling
memcmp()andmemchr()with an intentional buffer overflow is now caught at compile time:In function 'memcmp',
inlined from 'kasan_memcmp' atlib/test_kasan.c:897:2:include/linux/fortify-string.h:263:25: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter)263 | __read_overflow(); | ^~~~~~~~~~~~~~~~~ In function 'memchr', inlined from 'kasan_memchr' at lib/test_kasan.c:872:2: include/linux/fortify-string.h:277:17: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter) 277 | __read_overflow(); | ^~~~~~~~~~~~~~~~~Change the kasan tests to wrap those inside of a noinline function to prevent the compiler from noticing the bug and let kasan find it at runtime.
Signed-off-by Arnd Bergmann <[email protected]>
Quoted 8 lines
Quoted 1 line
Reviewed-by Vincenzo Frascino <[email protected]>How about just explicitly making the size invisible to the compiler?
I did this for similar issues in the same source:
https://lore.kernel.org/linux-hardening/[email protected]/T/#u
Arnd?
Quoted 30 lines · Andrew Morton
Quoted 28 lines · On Thu, 14 Oct 2021 19:40:45 -0700 Kees Cook <[email protected]> wrote:
Quoted 25 lines · Vincenzo Frascino
Quoted 21 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Calling
memcmp()andmemchr()with an intentional buffer overflow is now caught at compile time:In function 'memcmp',
inlined from 'kasan_memcmp' atlib/test_kasan.c:897:2:include/linux/fortify-string.h:263:25: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter)263 | __read_overflow(); | ^~~~~~~~~~~~~~~~~ In function 'memchr', inlined from 'kasan_memchr' at lib/test_kasan.c:872:2: include/linux/fortify-string.h:277:17: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter) 277 | __read_overflow(); | ^~~~~~~~~~~~~~~~~Change the kasan tests to wrap those inside of a noinline function to prevent the compiler from noticing the bug and let kasan find it at runtime.
Signed-off-by Arnd Bergmann <[email protected]>
Quoted 7 lines
Quoted 7 lines
Quoted 1 line
Reviewed-by Vincenzo Frascino <[email protected]>How about just explicitly making the size invisible to the compiler?
I did this for similar issues in the same source:
https://lore.kernel.org/linux-hardening/[email protected]/T/#u
This is already fixed in your tree with:
"kasan: test: consolidate workarounds for unwanted __alloc_size() protection"
which was based on this original patch (and my comments).
Signature · 1 line
Kees Cook
Quoted 16 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Calling
memcmp()andmemchr()with an intentional buffer overflow is now caught at compile time:In function 'memcmp',
inlined from 'kasan_memcmp' atlib/test_kasan.c:897:2:include/linux/fortify-string.h:263:25: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter)263 | __read_overflow(); | ^~~~~~~~~~~~~~~~~ In function 'memchr', inlined from 'kasan_memchr' at lib/test_kasan.c:872:2: include/linux/fortify-string.h:277:17: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter) 277 | __read_overflow(); | ^~~~~~~~~~~~~~~~~
Quoted 3 lines
Change the kasan tests to wrap those inside of a noinline function to prevent the compiler from noticing the bug and let kasan find it at runtime.
Is this with W=1 ? I had explicitly disabled the read overflows for "phase 1" of the overflow restriction tightening...
(And what do you think of using OPTIMIZER_HIDE_VAR() instead[1]?
-Kees
[1] https://lore.kernel.org/linux-hardening/[email protected]/T/#u
Quoted 53 lines
Signed-off-by Arnd Bergmann <[email protected]>--- lib/test_kasan.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)lib/test_kasan.c +17
-2@@ -852,6 +852,21 @@ static void kmem_cache_invalid_free(struct kunit *test)kmem_cache_destroy (cache); } +/* +* noinline wrappers to prevent the compiler from noticing the overflow +* at compile time rather than having kasan catch it. +* */ +static noinline void *__kasan_memchr(const void *s, int c, size_t n) +{ +return memchr (s, c, n); +} + +static noinline int __kasan_memcmp(const void *s1, const void *s2, size_t n) +{ +return memcmp (s1, s2, n); +} + +static void kasan_memchr (struct kunit *test) {char *ptr;@@ -870,7 +885,7 @@ static void kasan_memchr(struct kunit *test)KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr);KUNIT_EXPECT_KASAN_FAIL (test, - kasan_ptr_result =memchr (ptr,'1' , size +1 )); + kasan_ptr_result =__kasan_memchr (ptr,'1' , size +1 ));kfree (ptr); }@@ -895,7 +910,7 @@ static void kasan_memcmp(struct kunit *test)memset (arr,0 ,sizeof (arr));KUNIT_EXPECT_KASAN_FAIL (test, - kasan_int_result =memcmp (ptr, arr, size+1 )); + kasan_int_result =__kasan_memcmp (ptr, arr, size+1 ));kfree (ptr); }Signature · 1 line
2.29.2
Signature · 1 line
Kees Cook
Quoted 17 lines · Kees Cook
Quoted 16 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Calling
memcmp()andmemchr()with an intentional buffer overflow is now caught at compile time:In function 'memcmp',
inlined from 'kasan_memcmp' atlib/test_kasan.c:897:2:include/linux/fortify-string.h:263:25: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter)263 | __read_overflow(); | ^~~~~~~~~~~~~~~~~ In function 'memchr', inlined from 'kasan_memchr' at lib/test_kasan.c:872:2: include/linux/fortify-string.h:277:17: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter) 277 | __read_overflow(); | ^~~~~~~~~~~~~~~~~
Quoted 6 lines
Quoted 3 lines
Change the kasan tests to wrap those inside of a noinline function to prevent the compiler from noticing the bug and let kasan find it at runtime.
Is this with W=1 ? I had explicitly disabled the read overflows for "phase 1" of the overflow restriction tightening...
I have a somewhat modified source tree that builds cleanly with W=1 after disabling all the noisy ones, so this is probably one that I would not have seen without it.
Quoted 3 lines
(And what do you think of using
OPTIMIZER_HIDE_VAR()instead[1]?[1] https://lore.kernel.org/linux-hardening/[email protected]/T/#u
Yes, that is probably better. I can try updating the patch tomorrow, unless you do it first.
Arnd