Skip to content

Commit cab71f7

Browse files
keestorvalds
authored andcommitted
kasan: test: silence intentional read overflow warnings
As done in commit d73dad4 ("kasan: test: bypass __alloc_size checks") for __write_overflow warnings, also silence some more cases that trip the __read_overflow warnings seen in 5.16-rc1[1]: In file included from include/linux/string.h:253, from include/linux/bitmap.h:10, from include/linux/cpumask.h:12, from include/linux/mm_types_task.h:14, from include/linux/mm_types.h:5, from include/linux/page-flags.h:13, from arch/arm64/include/asm/mte.h:14, from arch/arm64/include/asm/pgtable.h:12, from include/linux/pgtable.h:6, from include/linux/kasan.h:29, from lib/test_kasan.c:10: 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(); | ^~~~~~~~~~~~~~~~~ [1] http://kisskb.ellerman.id.au/kisskb/buildresult/14660585/log/ Link: https://lkml.kernel.org/r/20211116004111.3171781-1-keescook@chromium.org Fixes: d73dad4 ("kasan: test: bypass __alloc_size checks") Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-by: Andrey Konovalov <andreyknvl@gmail.com> Acked-by: Marco Elver <elver@google.com> Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com> Cc: Alexander Potapenko <glider@google.com> Cc: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent cc30042 commit cab71f7

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

lib/test_kasan.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -869,6 +869,7 @@ static void kasan_memchr(struct kunit *test)
869869
ptr = kmalloc(size, GFP_KERNEL | __GFP_ZERO);
870870
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
871871

872+
OPTIMIZER_HIDE_VAR(size);
872873
KUNIT_EXPECT_KASAN_FAIL(test,
873874
kasan_ptr_result = memchr(ptr, '1', size + 1));
874875

@@ -894,6 +895,7 @@ static void kasan_memcmp(struct kunit *test)
894895
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
895896
memset(arr, 0, sizeof(arr));
896897

898+
OPTIMIZER_HIDE_VAR(size);
897899
KUNIT_EXPECT_KASAN_FAIL(test,
898900
kasan_int_result = memcmp(ptr, arr, size+1));
899901
kfree(ptr);

0 commit comments

Comments
 (0)