Merge tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / misc / lkdtm / core.c

diff --git a/drivers/misc/lkdtm/core.c b/drivers/misc/lkdtm/core.c
index d416359..66ae6b2 100644 (file)
--- a/drivers/misc/lkdtm/core.c
+++ b/drivers/misc/lkdtm/core.c
@@ -15,7 +15,7 @@
  *
  * Debugfs support added by Simon Kagstrom <simon.kagstrom@netinsight.net>
  *
- * See Documentation/fault-injection/provoke-crashes.txt for instructions
+ * See Documentation/fault-injection/provoke-crashes.rst for instructions
  */
 #include "lkdtm.h"
 #include <linux/fs.h>
@@ -106,20 +106,24 @@ static const struct crashtype crashtypes[] = {
        CRASHTYPE(WARNING),
        CRASHTYPE(EXCEPTION),
        CRASHTYPE(LOOP),
-       CRASHTYPE(OVERFLOW),
+       CRASHTYPE(EXHAUST_STACK),
+       CRASHTYPE(CORRUPT_STACK),
+       CRASHTYPE(CORRUPT_STACK_STRONG),
        CRASHTYPE(CORRUPT_LIST_ADD),
        CRASHTYPE(CORRUPT_LIST_DEL),
        CRASHTYPE(CORRUPT_USER_DS),
-       CRASHTYPE(CORRUPT_STACK),
-       CRASHTYPE(CORRUPT_STACK_STRONG),
        CRASHTYPE(STACK_GUARD_PAGE_LEADING),
        CRASHTYPE(STACK_GUARD_PAGE_TRAILING),
+       CRASHTYPE(UNSET_SMEP),
        CRASHTYPE(UNALIGNED_LOAD_STORE_WRITE),
        CRASHTYPE(OVERWRITE_ALLOCATION),
        CRASHTYPE(WRITE_AFTER_FREE),
        CRASHTYPE(READ_AFTER_FREE),
        CRASHTYPE(WRITE_BUDDY_AFTER_FREE),
        CRASHTYPE(READ_BUDDY_AFTER_FREE),
+       CRASHTYPE(SLAB_FREE_DOUBLE),
+       CRASHTYPE(SLAB_FREE_CROSS),
+       CRASHTYPE(SLAB_FREE_PAGE),
        CRASHTYPE(SOFTLOCKUP),
        CRASHTYPE(HARDLOCKUP),
        CRASHTYPE(SPINLOCKUP),
@@ -426,6 +430,7 @@ static int __init lkdtm_module_init(void)
        lkdtm_bugs_init(&recur_count);
        lkdtm_perms_init();
        lkdtm_usercopy_init();
+       lkdtm_heap_init();
 
        /* Register debugfs interface */
        lkdtm_debugfs_root = debugfs_create_dir("provoke-crash", NULL);
@@ -463,6 +468,7 @@ static void __exit lkdtm_module_exit(void)
        debugfs_remove_recursive(lkdtm_debugfs_root);
 
        /* Handle test-specific clean-up. */
+       lkdtm_heap_exit();
        lkdtm_usercopy_exit();
 
        if (lkdtm_kprobe != NULL)