diff options
author | Kees Cook <keescook@chromium.org> | 2013-07-08 13:01:31 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-25 01:47:19 -0400 |
commit | 65892723c386d658234ffffa35789e68e0601982 (patch) | |
tree | 012dc12cf2a6bb976270d7a2bd639bc91794ea0f /drivers/misc/lkdtm.c | |
parent | 4f198289747f0391bc5a5574279b1791a8ca2d06 (diff) |
lkdtm: add "WARNING" trigger
For additional testing, add "WARNING" as a trigger that calls WARN_ON(1).
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/lkdtm.c')
-rw-r--r-- | drivers/misc/lkdtm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/misc/lkdtm.c b/drivers/misc/lkdtm.c index adb6bde2ecc2..b1323fc881b1 100644 --- a/drivers/misc/lkdtm.c +++ b/drivers/misc/lkdtm.c | |||
@@ -68,6 +68,7 @@ enum ctype { | |||
68 | CT_NONE, | 68 | CT_NONE, |
69 | CT_PANIC, | 69 | CT_PANIC, |
70 | CT_BUG, | 70 | CT_BUG, |
71 | CT_WARNING, | ||
71 | CT_EXCEPTION, | 72 | CT_EXCEPTION, |
72 | CT_LOOP, | 73 | CT_LOOP, |
73 | CT_OVERFLOW, | 74 | CT_OVERFLOW, |
@@ -95,6 +96,7 @@ static char* cp_name[] = { | |||
95 | static char* cp_type[] = { | 96 | static char* cp_type[] = { |
96 | "PANIC", | 97 | "PANIC", |
97 | "BUG", | 98 | "BUG", |
99 | "WARNING", | ||
98 | "EXCEPTION", | 100 | "EXCEPTION", |
99 | "LOOP", | 101 | "LOOP", |
100 | "OVERFLOW", | 102 | "OVERFLOW", |
@@ -284,6 +286,9 @@ static void lkdtm_do_action(enum ctype which) | |||
284 | case CT_BUG: | 286 | case CT_BUG: |
285 | BUG(); | 287 | BUG(); |
286 | break; | 288 | break; |
289 | case CT_WARNING: | ||
290 | WARN_ON(1); | ||
291 | break; | ||
287 | case CT_EXCEPTION: | 292 | case CT_EXCEPTION: |
288 | *((int *) 0) = 0; | 293 | *((int *) 0) = 0; |
289 | break; | 294 | break; |