nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

mm: remove rodata_test_data export, add pr_fmt

Browse source 
Since commit 3ad38ceb27 ("x86/mm: Remove CONFIG_DEBUG_NX_TEST"),
nothing is using the exported rodata_test_data variable, so drop the
export.

This additionally updates the pr_fmt to avoid redundant strings and
adjusts some whitespace.

Link: http://lkml.kernel.org/r/20170307005313.GA85809@beast
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Jinbum Park <jinb.park7@gmail.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Kees Cook 2017-05-03 14:53:32 -07:00 committed by Linus Torvalds
parent 9ab2594feb
commit 056b9d8a76
2 changed files with 9 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
include/linux/rodata_test.h
View file

@ -14,7 +14,6 @@
#define _RODATA_TEST_H #define _RODATA_TEST_H
#ifdef CONFIG_DEBUG_RODATA_TEST #ifdef CONFIG_DEBUG_RODATA_TEST
extern const int rodata_test_data;
void rodata_test(void); void rodata_test(void);
#else #else
static inline void rodata_test(void) {} static inline void rodata_test(void) {}

15
mm/rodata_test.c
View file

@ -9,11 +9,12 @@
* as published by the Free Software Foundation; version 2 * as published by the Free Software Foundation; version 2
* of the License. * of the License.
*/ */
#define pr_fmt(fmt) "rodata_test: " fmt
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/sections.h> #include <asm/sections.h>
const int rodata_test_data = 0xC3; const int rodata_test_data = 0xC3;
EXPORT_SYMBOL_GPL(rodata_test_data);
void rodata_test(void) void rodata_test(void)
{ {
@ -23,20 +24,20 @@ void rodata_test(void)
/* test 1: read the value */ /* test 1: read the value */
/* If this test fails, some previous testrun has clobbered the state */ /* If this test fails, some previous testrun has clobbered the state */
if (!rodata_test_data) { if (!rodata_test_data) {
pr_err("rodata_test: test 1 fails (start data)\n"); pr_err("test 1 fails (start data)\n");
return; return;
} }
/* test 2: write to the variable; this should fault */ /* test 2: write to the variable; this should fault */
if (!probe_kernel_write((void *)&rodata_test_data, if (!probe_kernel_write((void *)&rodata_test_data,
(void *)&zero, sizeof(zero))) { (void *)&zero, sizeof(zero))) {
pr_err("rodata_test: test data was not read only\n"); pr_err("test data was not read only\n");
return; return;
} }
/* test 3: check the value hasn't changed */ /* test 3: check the value hasn't changed */
if (rodata_test_data == zero) { if (rodata_test_data == zero) {
pr_err("rodata_test: test data was changed\n"); pr_err("test data was changed\n");
return; return;
} }
@ -44,13 +45,13 @@ void rodata_test(void)
start = (unsigned long)__start_rodata; start = (unsigned long)__start_rodata;
end = (unsigned long)__end_rodata; end = (unsigned long)__end_rodata;
if (start & (PAGE_SIZE - 1)) { if (start & (PAGE_SIZE - 1)) {
pr_err("rodata_test: start of .rodata is not page size aligned\n"); pr_err("start of .rodata is not page size aligned\n");
return; return;
} }
if (end & (PAGE_SIZE - 1)) { if (end & (PAGE_SIZE - 1)) {
pr_err("rodata_test: end of .rodata is not page size aligned\n"); pr_err("end of .rodata is not page size aligned\n");
return; return;
} }
pr_info("rodata_test: all tests were successful\n"); pr_info("all tests were successful\n");
} }