Commit f31e0960 authored Mar 22, 2016 by Jessica Yu Committed by Jiri Kosina Apr 01, 2016

module: s390: keep mod_arch_specific for livepatch modules



Livepatch needs to utilize the symbol information contained in the
mod_arch_specific struct in order to be able to call the s390
apply_relocate_add() function to apply relocations. Keep a reference to
syminfo if the module is a livepatch module. Remove the redundant vfree()
in module_finalize() since module_arch_freeing_init() (which also frees
those structures) is called in do_init_module(). If the module isn't a
livepatch module, we free the structures in module_arch_freeing_init() as
usual.

Signed-off-by: Jessica Yu <jeyu@redhat.com>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent 1ce15ef4

arch/s390/kernel/module.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -51,6 +51,10 @@ void *module_alloc(unsigned long size)

		void module_arch_freeing_init(struct module *mod)
		{
		if (is_livepatch_module(mod) &&
		mod->state == MODULE_STATE_LIVE)
		return;

		vfree(mod->arch.syminfo);
		mod->arch.syminfo = NULL;
		}
		@@ -425,7 +429,5 @@ int module_finalize(const Elf_Ehdr *hdr,
		struct module *me)
		{
		jump_label_apply_nops(me);
		vfree(me->arch.syminfo);
		me->arch.syminfo = NULL;
		return 0;
		}