Commit 056b9d8a authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds

mm: remove rodata_test_data export, add pr_fmt

Since commit 3ad38ceb ("x86/mm: Remove CONFIG_DEBUG_NX_TEST"),
nothing is using the exported rodata_test_data variable, so drop the

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

Link: 's avatarKees Cook <>
Cc: Jinbum Park <>
Cc: Arjan van de Ven <>
Signed-off-by: 's avatarAndrew Morton <>
Signed-off-by: 's avatarLinus Torvalds <>
parent 9ab2594f
......@@ -14,7 +14,6 @@
#define _RODATA_TEST_H
extern const int rodata_test_data;
void rodata_test(void);
static inline void rodata_test(void) {}
......@@ -9,11 +9,12 @@
* as published by the Free Software Foundation; version 2
* of the License.
#define pr_fmt(fmt) "rodata_test: " fmt
#include <linux/uaccess.h>
#include <asm/sections.h>
const int rodata_test_data = 0xC3;
void rodata_test(void)
......@@ -23,20 +24,20 @@ void rodata_test(void)
/* test 1: read the value */
/* If this test fails, some previous testrun has clobbered the state */
if (!rodata_test_data) {
pr_err("rodata_test: test 1 fails (start data)\n");
pr_err("test 1 fails (start data)\n");
/* test 2: write to the variable; this should fault */
if (!probe_kernel_write((void *)&rodata_test_data,
(void *)&zero, sizeof(zero))) {
pr_err("rodata_test: test data was not read only\n");
(void *)&zero, sizeof(zero))) {
pr_err("test data was not read only\n");
/* test 3: check the value hasn't changed */
if (rodata_test_data == zero) {
pr_err("rodata_test: test data was changed\n");
pr_err("test data was changed\n");
......@@ -44,13 +45,13 @@ void rodata_test(void)
start = (unsigned long)__start_rodata;
end = (unsigned long)__end_rodata;
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");
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");
pr_info("rodata_test: all tests were successful\n");
pr_info("all tests were successful\n");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment