[PATCH mm v2] another fix for "kasan: improve vmalloc tests"

From: andrey . konovalov
Date: Tue Feb 22 2022 - 13:26:41 EST


From: Andrey Konovalov <andreyknvl@xxxxxxxxxx>

set_memory_rw/ro() are not exported to be used in modules and thus
cannot be used in KUnit-compatible KASAN tests.

Do the checks that rely on these functions only when the tests are
built-in.

Reported-by: kernel test robot <lkp@xxxxxxxxx>
Signed-off-by: Andrey Konovalov <andreyknvl@xxxxxxxxxx>

---

Changes v1->v2:
- Hide checks under #if instead of dropping.
---
lib/test_kasan.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/lib/test_kasan.c b/lib/test_kasan.c
index ef99d81fe8b3..c4b7eb2bad77 100644
--- a/lib/test_kasan.c
+++ b/lib/test_kasan.c
@@ -1083,11 +1083,13 @@ static void vmalloc_helpers_tags(struct kunit *test)
KUNIT_ASSERT_TRUE(test, is_vmalloc_addr(ptr));
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vmalloc_to_page(ptr));

+#if !IS_MODULE(CONFIG_KASAN_KUNIT_TEST)
/* Make sure vmalloc'ed memory permissions can be changed. */
rv = set_memory_ro((unsigned long)ptr, 1);
KUNIT_ASSERT_GE(test, rv, 0);
rv = set_memory_rw((unsigned long)ptr, 1);
KUNIT_ASSERT_GE(test, rv, 0);
+#endif

vfree(ptr);
}
--
2.25.1