From: Igor Stoppa <igor.stoppa@gmail.com>
To: Andy Lutomirski <luto@amacapital.net>,
Kees Cook <keescook@chromium.org>,
Matthew Wilcox <willy@infradead.org>
Cc: igor.stoppa@huawei.com, Nadav Amit <nadav.amit@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
Dave Hansen <dave.hansen@linux.intel.com>,
linux-integrity@vger.kernel.org,
kernel-hardening@lists.openwall.com, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/6] rodata_test: refactor tests
Date: Tue, 4 Dec 2018 14:18:02 +0200 [thread overview]
Message-ID: <20181204121805.4621-4-igor.stoppa@huawei.com> (raw)
In-Reply-To: <20181204121805.4621-1-igor.stoppa@huawei.com>
Refactor the test cases, in preparation for using them also for testing
__wr_after_init memory.
Signed-off-by: Igor Stoppa <igor.stoppa@huawei.com>
CC: Andy Lutomirski <luto@amacapital.net>
CC: Nadav Amit <nadav.amit@gmail.com>
CC: Matthew Wilcox <willy@infradead.org>
CC: Peter Zijlstra <peterz@infradead.org>
CC: Kees Cook <keescook@chromium.org>
CC: Dave Hansen <dave.hansen@linux.intel.com>
CC: linux-integrity@vger.kernel.org
CC: kernel-hardening@lists.openwall.com
CC: linux-mm@kvack.org
CC: linux-kernel@vger.kernel.org
---
mm/rodata_test.c | 48 ++++++++++++++++++++++++++++--------------------
1 file changed, 28 insertions(+), 20 deletions(-)
diff --git a/mm/rodata_test.c b/mm/rodata_test.c
index d908c8769b48..3c1e515ca9b1 100644
--- a/mm/rodata_test.c
+++ b/mm/rodata_test.c
@@ -14,44 +14,52 @@
#include <linux/uaccess.h>
#include <asm/sections.h>
-static const int rodata_test_data = 0xC3;
+#define INIT_TEST_VAL 0xC3
-void rodata_test(void)
+static const int rodata_test_data = INIT_TEST_VAL;
+
+static bool test_data(char *data_type, const int *data,
+ unsigned long start, unsigned long end)
{
- unsigned long start, end;
int zero = 0;
/* test 1: read the value */
/* If this test fails, some previous testrun has clobbered the state */
- if (!rodata_test_data) {
- pr_err("test 1 fails (start data)\n");
- return;
+ if (*data != INIT_TEST_VAL) {
+ pr_err("%s: test 1 fails (init data value)\n", data_type);
+ return false;
}
/* test 2: write to the variable; this should fault */
- if (!probe_kernel_write((void *)&rodata_test_data,
- (void *)&zero, sizeof(zero))) {
- pr_err("test data was not read only\n");
- return;
+ if (!probe_kernel_write((void *)data, (void *)&zero, sizeof(zero))) {
+ pr_err("%s: test data was not read only\n", data_type);
+ return false;
}
/* test 3: check the value hasn't changed */
- if (rodata_test_data == zero) {
- pr_err("test data was changed\n");
- return;
+ if (*data != INIT_TEST_VAL) {
+ pr_err("%s: test data was changed\n", data_type);
+ return false;
}
/* test 4: check if the rodata section is PAGE_SIZE aligned */
- start = (unsigned long)__start_rodata;
- end = (unsigned long)__end_rodata;
if (start & (PAGE_SIZE - 1)) {
- pr_err("start of .rodata is not page size aligned\n");
- return;
+ pr_err("%s: start of data is not page size aligned\n",
+ data_type);
+ return false;
}
if (end & (PAGE_SIZE - 1)) {
- pr_err("end of .rodata is not page size aligned\n");
- return;
+ pr_err("%s: end of data is not page size aligned\n",
+ data_type);
+ return false;
}
+ return true;
+}
- pr_info("all tests were successful\n");
+void rodata_test(void)
+{
+ if (test_data("rodata", &rodata_test_data,
+ (unsigned long)&__start_rodata,
+ (unsigned long)&__end_rodata))
+ pr_info("all tests were successful\n");
}
--
2.19.1
next prev parent reply other threads:[~2018-12-04 12:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-04 12:17 [RFC v1 PATCH 0/6] hardening: statically allocated protected memory Igor Stoppa
2018-12-04 12:18 ` [PATCH 1/6] __wr_after_init: linker section and label Igor Stoppa
2018-12-04 12:18 ` [PATCH 2/6] __wr_after_init: write rare for static allocation Igor Stoppa
2018-12-05 23:13 ` Andy Lutomirski
2018-12-06 9:44 ` Peter Zijlstra
2018-12-09 22:32 ` Igor Stoppa
2018-12-10 9:59 ` Peter Zijlstra
2018-12-09 22:09 ` Igor Stoppa
2018-12-12 9:49 ` Martin Schwidefsky
2018-12-19 22:50 ` Igor Stoppa
2018-12-06 4:44 ` Matthew Wilcox
2018-12-09 22:22 ` Igor Stoppa
2018-12-04 12:18 ` Igor Stoppa [this message]
2018-12-04 12:18 ` [PATCH 4/6] rodata_test: add verification for __wr_after_init Igor Stoppa
2018-12-04 12:18 ` [PATCH 5/6] __wr_after_init: test write rare functionality Igor Stoppa
2018-12-04 12:18 ` [PATCH 6/6] __wr_after_init: lkdtm test Igor Stoppa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181204121805.4621-4-igor.stoppa@huawei.com \
--to=igor.stoppa@gmail.com \
--cc=dave.hansen@linux.intel.com \
--cc=igor.stoppa@huawei.com \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@amacapital.net \
--cc=nadav.amit@gmail.com \
--cc=peterz@infradead.org \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).