| From cf65058dc6ba13975e4ba5b963cf73f163438a27 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 25 Jun 2020 13:37:03 -0700 |
| Subject: selftests/lkdtm: Reset WARN_ONCE to avoid false negatives |
| |
| From: Kees Cook <keescook@chromium.org> |
| |
| [ Upstream commit 4fccc8c0ff740e62343b6de38426a48b345b95f4 ] |
| |
| Since we expect to see warnings every time for many tests, just reset |
| the WARN_ONCE flags each time the script runs. |
| |
| Fixes: 46d1a0f03d66 ("selftests/lkdtm: Add tests for LKDTM targets") |
| Signed-off-by: Kees Cook <keescook@chromium.org> |
| Link: https://lore.kernel.org/r/20200625203704.317097-4-keescook@chromium.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/testing/selftests/lkdtm/run.sh | 6 ++++++ |
| 1 file changed, 6 insertions(+) |
| |
| diff --git a/tools/testing/selftests/lkdtm/run.sh b/tools/testing/selftests/lkdtm/run.sh |
| index ee64ff8df8f4d..8383eb89d88a9 100755 |
| --- a/tools/testing/selftests/lkdtm/run.sh |
| +++ b/tools/testing/selftests/lkdtm/run.sh |
| @@ -8,6 +8,7 @@ |
| # |
| set -e |
| TRIGGER=/sys/kernel/debug/provoke-crash/DIRECT |
| +CLEAR_ONCE=/sys/kernel/debug/clear_warn_once |
| KSELFTEST_SKIP_TEST=4 |
| |
| # Verify we have LKDTM available in the kernel. |
| @@ -67,6 +68,11 @@ cleanup() { |
| } |
| trap cleanup EXIT |
| |
| +# Reset WARN_ONCE counters so we trip it each time this runs. |
| +if [ -w $CLEAR_ONCE ] ; then |
| + echo 1 > $CLEAR_ONCE |
| +fi |
| + |
| # Save existing dmesg so we can detect new content below |
| dmesg > "$DMESG" |
| |
| -- |
| 2.25.1 |
| |
