diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2015-01-11 20:32:41 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-02-20 00:49:40 +0000 |
| commit | 309adf3c8062595aeea4f388f2ff7f9492e50979 (patch) | |
| tree | d30cacef3abff83b70d2fe8dafc0731c63b60bac | |
| parent | dc705052ba60523be48039064dc148cef9a746ce (diff) | |
Revert "x86, 64bit, mm: Mark data/bss/brk to nx"
This reverts commit e105c8187b7101e8a8a54ac0218c9d9c9463c636 which
was commit 72212675d1c96f5db8ec6fb35701879911193158 upstream.
This caused suspend/resume to stop working on at least some systems -
specifically, the system would reboot when woken.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | arch/x86/mm/init_64.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index a2340ee02f0b..44b93da18401 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -778,7 +778,6 @@ void mark_rodata_ro(void) unsigned long text_end = PAGE_ALIGN((unsigned long) &__stop___ex_table); unsigned long rodata_end = PAGE_ALIGN((unsigned long) &__end_rodata); unsigned long data_start = (unsigned long) &_sdata; - unsigned long all_end = PFN_ALIGN(&_end); printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n", (end - start) >> 10); @@ -787,10 +786,10 @@ void mark_rodata_ro(void) kernel_set_to_readonly = 1; /* - * The rodata/data/bss/brk section (but not the kernel text!) - * should also be not-executable. + * The rodata section (but not the kernel text!) should also be + * not-executable. */ - set_memory_nx(rodata_start, (all_end - rodata_start) >> PAGE_SHIFT); + set_memory_nx(rodata_start, (end - rodata_start) >> PAGE_SHIFT); rodata_test(); |