Commit ac88ee7d authored by Christophe Leroy's avatar Christophe Leroy Committed by Luis Chamberlain
Browse files

module: Use set_memory_rox() 



A couple of architectures seem concerned about calling set_memory_ro()
and set_memory_x() too frequently and have implemented a version of
set_memory_rox(), see commit 60463628 ("x86/mm: Implement native
set_memory_rox()") and commit 22e99fa5 ("s390/mm: implement
set_memory_rox()")

Use set_memory_rox() in modules when STRICT_MODULES_RWX is set.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 41bccc98

kernel/module/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static inline struct module *mod_find(unsigned long addr, struct mod_tree_root * 


void module_enable_ro(const struct module *mod, bool after_init);

void module_enable_nx(const struct module *mod);

void module_enable_x(const struct module *mod);

void module_enable_rox(const struct module *mod);

int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,

				char *secstrings, struct module *mod);

kernel/module/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2738,7 +2738,7 @@ static int complete_formation(struct module *mod, struct load_info *info) 


	module_enable_ro(mod, false);

	module_enable_nx(mod);

	module_enable_x(mod);

	module_enable_rox(mod);



	/*

	 * Mark state as coming so strong_try_module_get() ignores us,

kernel/module/strict_rwx.c

+7 −5
Original line number Diff line number Diff line
@@ -26,11 +26,15 @@ static void module_set_memory(const struct module *mod, enum mod_mem_type type, 
 * CONFIG_STRICT_MODULE_RWX because they are needed regardless of whether we

 * are strict.

 */

void module_enable_x(const struct module *mod)

void module_enable_rox(const struct module *mod)

{

	for_class_mod_mem_type(type, text)

	for_class_mod_mem_type(type, text) {

		if (IS_ENABLED(CONFIG_STRICT_MODULE_RWX))

			module_set_memory(mod, type, set_memory_rox);

		else

			module_set_memory(mod, type, set_memory_x);

	}

}



void module_enable_ro(const struct module *mod, bool after_init)

{
@@ -41,8 +45,6 @@ void module_enable_ro(const struct module *mod, bool after_init) 
		return;

#endif



	module_set_memory(mod, MOD_TEXT, set_memory_ro);

	module_set_memory(mod, MOD_INIT_TEXT, set_memory_ro);

	module_set_memory(mod, MOD_RODATA, set_memory_ro);

	module_set_memory(mod, MOD_INIT_RODATA, set_memory_ro);