projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ntb-5.15' of git://github.com/jonmason/ntb
[linux-2.6-microblaze.git]
/
lib
/
test_kasan_module.c
diff --git
a/lib/test_kasan_module.c
b/lib/test_kasan_module.c
index
f1017f3
..
7ebf433
100644
(file)
--- a/
lib/test_kasan_module.c
+++ b/
lib/test_kasan_module.c
@@
-15,13
+15,11
@@
#include "../mm/kasan/kasan.h"
#include "../mm/kasan/kasan.h"
-#define OOB_TAG_OFF (IS_ENABLED(CONFIG_KASAN_GENERIC) ? 0 : KASAN_GRANULE_SIZE)
-
static noinline void __init copy_user_test(void)
{
char *kmem;
char __user *usermem;
static noinline void __init copy_user_test(void)
{
char *kmem;
char __user *usermem;
- size_t size = 1
0
;
+ size_t size = 1
28 - KASAN_GRANULE_SIZE
;
int __maybe_unused unused;
kmem = kmalloc(size, GFP_KERNEL);
int __maybe_unused unused;
kmem = kmalloc(size, GFP_KERNEL);
@@
-38,25
+36,25
@@
static noinline void __init copy_user_test(void)
}
pr_info("out-of-bounds in copy_from_user()\n");
}
pr_info("out-of-bounds in copy_from_user()\n");
- unused = copy_from_user(kmem, usermem, size + 1
+ OOB_TAG_OFF
);
+ unused = copy_from_user(kmem, usermem, size + 1);
pr_info("out-of-bounds in copy_to_user()\n");
pr_info("out-of-bounds in copy_to_user()\n");
- unused = copy_to_user(usermem, kmem, size + 1
+ OOB_TAG_OFF
);
+ unused = copy_to_user(usermem, kmem, size + 1);
pr_info("out-of-bounds in __copy_from_user()\n");
pr_info("out-of-bounds in __copy_from_user()\n");
- unused = __copy_from_user(kmem, usermem, size + 1
+ OOB_TAG_OFF
);
+ unused = __copy_from_user(kmem, usermem, size + 1);
pr_info("out-of-bounds in __copy_to_user()\n");
pr_info("out-of-bounds in __copy_to_user()\n");
- unused = __copy_to_user(usermem, kmem, size + 1
+ OOB_TAG_OFF
);
+ unused = __copy_to_user(usermem, kmem, size + 1);
pr_info("out-of-bounds in __copy_from_user_inatomic()\n");
pr_info("out-of-bounds in __copy_from_user_inatomic()\n");
- unused = __copy_from_user_inatomic(kmem, usermem, size + 1
+ OOB_TAG_OFF
);
+ unused = __copy_from_user_inatomic(kmem, usermem, size + 1);
pr_info("out-of-bounds in __copy_to_user_inatomic()\n");
pr_info("out-of-bounds in __copy_to_user_inatomic()\n");
- unused = __copy_to_user_inatomic(usermem, kmem, size + 1
+ OOB_TAG_OFF
);
+ unused = __copy_to_user_inatomic(usermem, kmem, size + 1);
pr_info("out-of-bounds in strncpy_from_user()\n");
pr_info("out-of-bounds in strncpy_from_user()\n");
- unused = strncpy_from_user(kmem, usermem, size + 1
+ OOB_TAG_OFF
);
+ unused = strncpy_from_user(kmem, usermem, size + 1);
vm_munmap((unsigned long)usermem, PAGE_SIZE);
kfree(kmem);
vm_munmap((unsigned long)usermem, PAGE_SIZE);
kfree(kmem);
@@
-73,7
+71,7
@@
static noinline void __init kasan_rcu_reclaim(struct rcu_head *rp)
struct kasan_rcu_info, rcu);
kfree(fp);
struct kasan_rcu_info, rcu);
kfree(fp);
-
fp->i = 1
;
+
((volatile struct kasan_rcu_info *)fp)->i
;
}
static noinline void __init kasan_rcu_uaf(void)
}
static noinline void __init kasan_rcu_uaf(void)