Commit d48567c9 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Dave Hansen
Browse files

mm: Introduce set_memory_rox() 



Because endlessly repeating:

	set_memory_ro()
	set_memory_x()

is getting tedious.

Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/Y1jek64pXOsougmz@hirez.programming.kicks-ass.net
parent 414ebf14

arch/arm/mach-omap1/sram-init.c

+3 −5
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/set_memory.h>



#include <asm/fncpy.h>

#include <asm/tlb.h>

#include <asm/cacheflush.h>

#include <asm/set_memory.h>



#include <asm/mach/map.h>
@@ -74,8 +74,7 @@ void *omap_sram_push(void *funcp, unsigned long size) 


	dst = fncpy(sram, funcp, size);



	set_memory_ro(base, pages);

	set_memory_x(base, pages);

	set_memory_rox(base, pages);



	return dst;

}
@@ -126,8 +125,7 @@ static void __init omap_detect_and_map_sram(void) 
	base = (unsigned long)omap_sram_base;

	pages = PAGE_ALIGN(omap_sram_size) / PAGE_SIZE;



	set_memory_ro(base, pages);

	set_memory_x(base, pages);

	set_memory_rox(base, pages);

}



static void (*_omap_sram_reprogram_clock)(u32 dpllctl, u32 ckctl);

arch/arm/mach-omap2/sram.c

+3 −5
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/set_memory.h>



#include <asm/fncpy.h>

#include <asm/tlb.h>

#include <asm/cacheflush.h>

#include <asm/set_memory.h>



#include <asm/mach/map.h>
@@ -96,8 +96,7 @@ void *omap_sram_push(void *funcp, unsigned long size) 


	dst = fncpy(sram, funcp, size);



	set_memory_ro(base, pages);

	set_memory_x(base, pages);

	set_memory_rox(base, pages);



	return dst;

}
@@ -217,8 +216,7 @@ static void __init omap2_map_sram(void) 
	base = (unsigned long)omap_sram_base;

	pages = PAGE_ALIGN(omap_sram_size) / PAGE_SIZE;



	set_memory_ro(base, pages);

	set_memory_x(base, pages);

	set_memory_rox(base, pages);

}



static void (*_omap2_sram_ddr_init)(u32 *slow_dll_ctrl, u32 fast_dll_ctrl,

arch/powerpc/kernel/kprobes.c

+4 −5
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ 
#include <linux/kdebug.h>

#include <linux/slab.h>

#include <linux/moduleloader.h>

#include <linux/set_memory.h>

#include <asm/code-patching.h>

#include <asm/cacheflush.h>

#include <asm/sstep.h>

#include <asm/sections.h>

#include <asm/inst.h>

#include <asm/set_memory.h>

#include <linux/uaccess.h>



DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
@@ -134,10 +134,9 @@ void *alloc_insn_page(void) 
	if (!page)

		return NULL;



	if (strict_module_rwx_enabled()) {

		set_memory_ro((unsigned long)page, 1);

		set_memory_x((unsigned long)page, 1);

	}

	if (strict_module_rwx_enabled())

		set_memory_rox((unsigned long)page, 1);



	return page;

}

arch/x86/kernel/ftrace.c

+2 −3
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ 
#include <linux/module.h>

#include <linux/memory.h>

#include <linux/vmalloc.h>

#include <linux/set_memory.h>



#include <trace/syscall.h>



#include <asm/set_memory.h>

#include <asm/kprobes.h>

#include <asm/ftrace.h>

#include <asm/nops.h>
@@ -415,8 +415,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size) 


	set_vm_flush_reset_perms(trampoline);



	set_memory_ro((unsigned long)trampoline, npages);

	set_memory_x((unsigned long)trampoline, npages);

	set_memory_rox((unsigned long)trampoline, npages);

	return (unsigned long)trampoline;

fail:

	tramp_free(trampoline);

arch/x86/kernel/kprobes/core.c

+2 −7
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <linux/objtool.h>

#include <linux/vmalloc.h>

#include <linux/pgtable.h>

#include <linux/set_memory.h>



#include <asm/text-patching.h>

#include <asm/cacheflush.h>
@@ -51,7 +52,6 @@ 
#include <asm/alternative.h>

#include <asm/insn.h>

#include <asm/debugreg.h>

#include <asm/set_memory.h>

#include <asm/ibt.h>



#include "common.h"
@@ -415,17 +415,12 @@ void *alloc_insn_page(void) 
		return NULL;



	set_vm_flush_reset_perms(page);

	/*

	 * First make the page read-only, and only then make it executable to

	 * prevent it from being W+X in between.

	 */

	set_memory_ro((unsigned long)page, 1);



	/*

	 * TODO: Once additional kernel code protection mechanisms are set, ensure

	 * that the page was not maliciously altered and it is still zeroed.

	 */

	set_memory_x((unsigned long)page, 1);

	set_memory_rox((unsigned long)page, 1);



	return page;

}