Commit a77d087f authored by Kees Cook's avatar Kees Cook
Browse files

lkdtm: Do not depend on BLOCK and clean up headers 



After the transition to kprobes, symbols are resolved at runtime. This
means there is no need to have all the Kconfig and header logic to
avoid build failures. This also paves the way to having arbitrary test
locations.

Reported-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent bfeffd15

drivers/misc/lkdtm/core.c

+0 −9
Original line number Diff line number Diff line
@@ -37,16 +37,9 @@ 
#include <linux/kprobes.h>

#include <linux/list.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/hrtimer.h>

#include <linux/slab.h>

#include <scsi/scsi_cmnd.h>

#include <linux/debugfs.h>



#ifdef CONFIG_IDE

#include <linux/ide.h>

#endif



#define DEFAULT_COUNT 10



static int lkdtm_debugfs_open(struct inode *inode, struct file *file);
@@ -102,10 +95,8 @@ static struct crashpoint crashpoints[] = { 
	CRASHPOINT("MEM_SWAPOUT",	 "shrink_inactive_list"),

	CRASHPOINT("TIMERADD",		 "hrtimer_start"),

	CRASHPOINT("SCSI_DISPATCH_CMD",	 "scsi_dispatch_cmd"),

# ifdef CONFIG_IDE

	CRASHPOINT("IDE_CORE_CP",	 "generic_ide_ioctl"),

#endif

#endif

};

lib/Kconfig.debug

+0 −1
Original line number Diff line number Diff line
@@ -1700,7 +1700,6 @@ if RUNTIME_TESTING_MENU 
config LKDTM

	tristate "Linux Kernel Dump Test Tool Module"

	depends on DEBUG_FS

	depends on BLOCK

	help

	This module enables testing of the different dumping mechanisms by

	inducing system failures at predefined crash points.

CRA Git | Maintained and supported by SUSTech CRA and CCSE