Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38b37d63 authored by Matthias Schiffer's avatar Matthias Schiffer Committed by Jessica Yu
Browse files

module: allow arch overrides for .exit section names 



Some archs like ARM store unwind information for .exit.text in sections
with unusual names. As this unwind information refers to .exit.text, it
must not be loaded when .exit.text is not loaded (when CONFIG_MODULE_UNLOAD
is unset); otherwise, loading a module can fail due to relocation failures.

Signed-off-by: default avatarMatthias Schiffer <matthias.schiffer@ew.tq-group.com>
Signed-off-by: default avatarJessica Yu <jeyu@kernel.org>
parent 2eef1399

include/linux/moduleloader.h

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ void *module_alloc(unsigned long size); 
/* Free memory returned from module_alloc. */

void module_memfree(void *module_region);



/* Determines if the section name is an exit section (that is only used during

 * module unloading)

 */

bool module_exit_section(const char *name);



/*

 * Apply the given relocation to the (simplified) ELF.  Return -error

 * or 0.

kernel/module.c

+6 −1
Original line number Diff line number Diff line
@@ -2748,6 +2748,11 @@ void * __weak module_alloc(unsigned long size) 
	return vmalloc_exec(size);

}



bool __weak module_exit_section(const char *name)

{

	return strstarts(name, ".exit");

}



#ifdef CONFIG_DEBUG_KMEMLEAK

static void kmemleak_load_module(const struct module *mod,

				 const struct load_info *info)
@@ -2937,7 +2942,7 @@ static int rewrite_section_headers(struct load_info *info, int flags) 


#ifndef CONFIG_MODULE_UNLOAD

		/* Don't load .exit sections */

		if (strstarts(info->secstrings+shdr->sh_name, ".exit"))

		if (module_exit_section(info->secstrings+shdr->sh_name))

			shdr->sh_flags &= ~(unsigned long)SHF_ALLOC;

#endif

	}