diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-28 22:37:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-28 22:37:55 +0200 |
| commit | d4e34999a7571e0a8d43cec6a0f13ecf40d3b1e8 (patch) | |
| tree | 44c2b72be082c7f7e682f5c4fde1c70698e68b03 /drivers/misc/lkdtm/bugs.c | |
| parent | misc: xilinx_sdfec: fix spelling mistake: "Schdule" -> "Schedule" (diff) | |
| parent | lkdtm: Split WARNING into separate tests (diff) | |
| download | wireguard-linux-d4e34999a7571e0a8d43cec6a0f13ecf40d3b1e8.tar.xz wireguard-linux-d4e34999a7571e0a8d43cec6a0f13ecf40d3b1e8.zip | |
Merge tag 'lkdtm-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-next
Kees writes:
Updates to LKDTM for -next
- split WARNING into two tests: with message and without
- add prototype-granularity forward CFI test
* tag 'lkdtm-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
lkdtm: Split WARNING into separate tests
lkdtm: Add Control Flow Integrity test
Diffstat (limited to 'drivers/misc/lkdtm/bugs.c')
| -rw-r--r-- | drivers/misc/lkdtm/bugs.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/misc/lkdtm/bugs.c b/drivers/misc/lkdtm/bugs.c index 1606658b9b7e..98fad7909592 100644 --- a/drivers/misc/lkdtm/bugs.c +++ b/drivers/misc/lkdtm/bugs.c @@ -75,7 +75,12 @@ static int warn_counter; void lkdtm_WARNING(void) { - WARN(1, "Warning message trigger count: %d\n", warn_counter++); + WARN_ON(++warn_counter); +} + +void lkdtm_WARNING_MESSAGE(void) +{ + WARN(1, "Warning message trigger count: %d\n", ++warn_counter); } void lkdtm_EXCEPTION(void) |