Commit 01526ed0 authored by Jan Glauber's avatar Jan Glauber Committed by Rusty Russell
Browse files

module: split unset_section_ro_nx function. 



Split the unprotect function into a function per section to make
the code more readable and add the missing static declaration.

Signed-off-by: default avatarJan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 448694a1

kernel/module.c

+23 −22
Original line number Diff line number Diff line
@@ -1607,17 +1607,18 @@ static void set_section_ro_nx(void *base, 
	}

}



/* Setting memory back to W+X before releasing it */

void unset_section_ro_nx(struct module *mod, void *module_region)

static void unset_module_core_ro_nx(struct module *mod)

{

	if (mod->module_core == module_region) {

	set_page_attributes(mod->module_core + mod->core_text_size,

		mod->module_core + mod->core_size,

		set_memory_x);

	set_page_attributes(mod->module_core,

		mod->module_core + mod->core_ro_size,

		set_memory_rw);

	} else if (mod->module_init == module_region) {

}



static void unset_module_init_ro_nx(struct module *mod)

{

	set_page_attributes(mod->module_init + mod->init_text_size,

		mod->module_init + mod->init_size,

		set_memory_x);
@@ -1625,7 +1626,6 @@ void unset_section_ro_nx(struct module *mod, void *module_region) 
		mod->module_init + mod->init_ro_size,

		set_memory_rw);

}

}



/* Iterate through all modules and set each module's text as RW */

void set_all_modules_text_rw(void)
@@ -1670,7 +1670,8 @@ void set_all_modules_text_ro(void) 
}

#else

static inline void set_section_ro_nx(void *base, unsigned long text_size, unsigned long ro_size, unsigned long total_size) { }

static inline void unset_section_ro_nx(struct module *mod, void *module_region) { }

static void unset_module_core_ro_nx(struct module *mod) { }

static void unset_module_init_ro_nx(struct module *mod) { }

#endif



/* Free a module, remove from lists, etc. */
@@ -1697,7 +1698,7 @@ static void free_module(struct module *mod) 
	destroy_params(mod->kp, mod->num_kp);



	/* This may be NULL, but that's OK */

	unset_section_ro_nx(mod, mod->module_init);

	unset_module_init_ro_nx(mod);

	module_free(mod, mod->module_init);

	kfree(mod->args);

	percpu_modfree(mod);
@@ -1706,7 +1707,7 @@ static void free_module(struct module *mod) 
	lockdep_free_key_range(mod->module_core, mod->core_size);



	/* Finally, free the core (containing the module structure) */

	unset_section_ro_nx(mod, mod->module_core);

	unset_module_core_ro_nx(mod);

	module_free(mod, mod->module_core);



#ifdef CONFIG_MPU
@@ -2932,7 +2933,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, 
	mod->symtab = mod->core_symtab;

	mod->strtab = mod->core_strtab;

#endif

	unset_section_ro_nx(mod, mod->module_init);

	unset_module_init_ro_nx(mod);

	module_free(mod, mod->module_init);

	mod->module_init = NULL;

	mod->init_size = 0;