kasan: introduce kasan_mempool_unpoison_pages

[linux-2.6-microblaze.git] / mm / kasan / kasan_test.c

diff --git a/mm/kasan/kasan_test.c b/mm/kasan/kasan_test.c
index 8281eb4..34515a1 100644 (file)
--- a/mm/kasan/kasan_test.c
+++ b/mm/kasan/kasan_test.c
@@ -493,14 +493,17 @@ static void kmalloc_oob_memset_2(struct kunit *test)
 {
        char *ptr;
        size_t size = 128 - KASAN_GRANULE_SIZE;
+       size_t memset_size = 2;
 
        KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test);
 
        ptr = kmalloc(size, GFP_KERNEL);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
 
+       OPTIMIZER_HIDE_VAR(ptr);
        OPTIMIZER_HIDE_VAR(size);
-       KUNIT_EXPECT_KASAN_FAIL(test, memset(ptr + size - 1, 0, 2));
+       OPTIMIZER_HIDE_VAR(memset_size);
+       KUNIT_EXPECT_KASAN_FAIL(test, memset(ptr + size - 1, 0, memset_size));
        kfree(ptr);
 }
 
@@ -508,14 +511,17 @@ static void kmalloc_oob_memset_4(struct kunit *test)
 {
        char *ptr;
        size_t size = 128 - KASAN_GRANULE_SIZE;
+       size_t memset_size = 4;
 
        KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test);
 
        ptr = kmalloc(size, GFP_KERNEL);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
 
+       OPTIMIZER_HIDE_VAR(ptr);
        OPTIMIZER_HIDE_VAR(size);
-       KUNIT_EXPECT_KASAN_FAIL(test, memset(ptr + size - 3, 0, 4));
+       OPTIMIZER_HIDE_VAR(memset_size);
+       KUNIT_EXPECT_KASAN_FAIL(test, memset(ptr + size - 3, 0, memset_size));
        kfree(ptr);
 }
 
@@ -523,14 +529,17 @@ static void kmalloc_oob_memset_8(struct kunit *test)
 {
        char *ptr;
        size_t size = 128 - KASAN_GRANULE_SIZE;
+       size_t memset_size = 8;
 
        KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test);
 
        ptr = kmalloc(size, GFP_KERNEL);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
 
+       OPTIMIZER_HIDE_VAR(ptr);
        OPTIMIZER_HIDE_VAR(size);
-       KUNIT_EXPECT_KASAN_FAIL(test, memset(ptr + size - 7, 0, 8));
+       OPTIMIZER_HIDE_VAR(memset_size);
+       KUNIT_EXPECT_KASAN_FAIL(test, memset(ptr + size - 7, 0, memset_size));
        kfree(ptr);
 }
 
@@ -538,14 +547,17 @@ static void kmalloc_oob_memset_16(struct kunit *test)
 {
        char *ptr;
        size_t size = 128 - KASAN_GRANULE_SIZE;
+       size_t memset_size = 16;
 
        KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test);
 
        ptr = kmalloc(size, GFP_KERNEL);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
 
+       OPTIMIZER_HIDE_VAR(ptr);
        OPTIMIZER_HIDE_VAR(size);
-       KUNIT_EXPECT_KASAN_FAIL(test, memset(ptr + size - 15, 0, 16));
+       OPTIMIZER_HIDE_VAR(memset_size);
+       KUNIT_EXPECT_KASAN_FAIL(test, memset(ptr + size - 15, 0, memset_size));
        kfree(ptr);
 }