| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20200227024301.217042-2-trishalfonso@google.com>
Date: Wed, 26 Feb 2020 18:43:01 -0800
From: Patricia Alfonso <trishalfonso@...gle.com>
To: aryabinin@...tuozzo.com, dvyukov@...gle.com,
brendanhiggins@...gle.com, davidgow@...gle.com, mingo@...hat.com,
peterz@...radead.org, juri.lelli@...hat.com,
vincent.guittot@...aro.org
Cc: linux-kernel@...r.kernel.org, kasan-dev@...glegroups.com,
linux-kselftest@...r.kernel.org, kunit-dev@...glegroups.com,
Patricia Alfonso <trishalfonso@...gle.com>
Subject: [RFC PATCH 2/2] KUnit: KASAN Integration
Integrate KASAN into KUnit testing framework.
- Fail tests when KASAN reports an error that is not expected
- Use KUNIT_EXPECT_KASAN_FAIL to expect a KASAN error in KASAN tests
- KUnit struct added to current task to keep track of the current test
from KASAN code
- Booleans representing if a KASAN report is expected and if a KASAN
report is found added to kunit struct
- This prints "line# has passed" or "line# has failed"
Signed-off-by: Patricia Alfonso <trishalfonso@...gle.com>
---
If anyone has any suggestions on how best to print the failure
messages, please share!
One issue I have found while testing this is the allocation fails in
kmalloc_pagealloc_oob_right() sometimes, but not consistently. This
does cause the test to fail on the KUnit side, as expected, but it
seems to skip all the tests before this one because the output starts
with this failure instead of with the first test, kmalloc_oob_right().
include/kunit/test.h | 24 ++++++++++++++++++++++++
include/linux/sched.h | 7 ++++++-
lib/kunit/test.c | 7 ++++++-
mm/kasan/report.c | 19 +++++++++++++++++++
tools/testing/kunit/kunit_kernel.py | 2 +-
5 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/include/kunit/test.h b/include/kunit/test.h
index 2dfb550c6723..2e388f8937f3 100644
--- a/include/kunit/test.h
+++ b/include/kunit/test.h
@@ -21,6 +21,8 @@ struct kunit_resource;
typedef int (*kunit_resource_init_t)(struct kunit_resource *, void *);
typedef void (*kunit_resource_free_t)(struct kunit_resource *);
+void kunit_set_failure(struct kunit *test);
+
/**
* struct kunit_resource - represents a *test managed resource*
* @allocation: for the user to store arbitrary data.
@@ -191,6 +193,9 @@ struct kunit {
* protect it with some type of lock.
*/
struct list_head resources; /* Protected by lock. */
+
+ bool kasan_report_expected;
+ bool kasan_report_found;
};
void kunit_init_test(struct kunit *test, const char *name);
@@ -941,6 +946,25 @@ do { \
ptr, \
NULL)
+/**
+ * KUNIT_EXPECT_KASAN_FAIL() - Causes a test failure when the expression does
+ * not cause a KASAN error.
+ *
+ */
+#define KUNIT_EXPECT_KASAN_FAIL(test, condition) do { \
+ test->kasan_report_expected = true; \
+ test->kasan_report_found = false; \
+ condition; \
+ if (test->kasan_report_found == test->kasan_report_expected) { \
+ pr_info("%d has passed", __LINE__); \
+ } else { \
+ kunit_set_failure(test); \
+ pr_info("%d has failed", __LINE__); \
+ } \
+ test->kasan_report_expected = false; \
+ test->kasan_report_found = false; \
+} while (0)
+
/**
* KUNIT_EXPECT_TRUE() - Causes a test failure when the expression is not true.
* @test: The test context object.
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 04278493bf15..db23d56061e7 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -32,6 +32,8 @@
#include <linux/posix-timers.h>
#include <linux/rseq.h>
+#include <kunit/test.h>
+
/* task_struct member predeclarations (sorted alphabetically): */
struct audit_context;
struct backing_dev_info;
@@ -1178,7 +1180,10 @@ struct task_struct {
#ifdef CONFIG_KASAN
unsigned int kasan_depth;
-#endif
+#ifdef CONFIG_KUNIT
+ struct kunit *kasan_kunit_test;
+#endif /* CONFIG_KUNIT */
+#endif /* CONFIG_KASAN */
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
/* Index of current stored address in ret_stack: */
diff --git a/lib/kunit/test.c b/lib/kunit/test.c
index 9242f932896c..d266b9495c67 100644
--- a/lib/kunit/test.c
+++ b/lib/kunit/test.c
@@ -9,11 +9,12 @@
#include <kunit/test.h>
#include <linux/kernel.h>
#include <linux/sched/debug.h>
+#include <linux/sched.h>
#include "string-stream.h"
#include "try-catch-impl.h"
-static void kunit_set_failure(struct kunit *test)
+void kunit_set_failure(struct kunit *test)
{
WRITE_ONCE(test->success, false);
}
@@ -236,6 +237,10 @@ static void kunit_try_run_case(void *data)
struct kunit_suite *suite = ctx->suite;
struct kunit_case *test_case = ctx->test_case;
+#ifdef CONFIG_KASAN
+ current->kasan_kunit_test = test;
+#endif
+
/*
* kunit_run_case_internal may encounter a fatal error; if it does,
* abort will be called, this thread will exit, and finally the parent
diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index 5ef9f24f566b..5554d23799a5 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -32,6 +32,8 @@
#include <asm/sections.h>
+#include <kunit/test.h>
+
#include "kasan.h"
#include "../slab.h"
@@ -461,6 +463,15 @@ void kasan_report_invalid_free(void *object, unsigned long ip)
u8 tag = get_tag(object);
object = reset_tag(object);
+
+ if (current->kasan_kunit_test) {
+ if (current->kasan_kunit_test->kasan_report_expected) {
+ current->kasan_kunit_test->kasan_report_found = true;
+ return;
+ }
+ kunit_set_failure(current->kasan_kunit_test);
+ }
+
start_report(&flags);
pr_err("BUG: KASAN: double-free or invalid-free in %pS\n", (void *)ip);
print_tags(tag, object);
@@ -481,6 +492,14 @@ void __kasan_report(unsigned long addr, size_t size, bool is_write, unsigned lon
if (likely(!report_enabled()))
return;
+ if (current->kasan_kunit_test) {
+ if (current->kasan_kunit_test->kasan_report_expected) {
+ current->kasan_kunit_test->kasan_report_found = true;
+ return;
+ }
+ kunit_set_failure(current->kasan_kunit_test);
+ }
+
disable_trace_on_warning();
tagged_addr = (void *)addr;
diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py
index cc5d844ecca1..63eab18a8c34 100644
--- a/tools/testing/kunit/kunit_kernel.py
+++ b/tools/testing/kunit/kunit_kernel.py
@@ -141,7 +141,7 @@ class LinuxSourceTree(object):
return True
def run_kernel(self, args=[], timeout=None, build_dir=''):
- args.extend(['mem=256M'])
+ args.extend(['mem=256M', 'kasan_multi_shot'])
process = self._ops.linux_bin(args, timeout, build_dir)
with open(os.path.join(build_dir, 'test.log'), 'w') as f:
for line in process.stdout:
--
2.25.0.265.gbab2e86ba0-goog
Powered by blists - more mailing lists