diff options
| author | Jessica Yu <jeyu@redhat.com> | 2016-03-22 20:03:17 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-04-01 15:00:11 +0200 |
| commit | f31e0960f395df0c9197de53674365e2a28a129b (patch) | |
| tree | 1d2505d29ee027304baf58075e2989b6d484b65c /arch/s390 | |
| parent | 1ce15ef4f60529cf1313f80f4338c88bd65cc572 (diff) | |
| download | op-kernel-dev-f31e0960f395df0c9197de53674365e2a28a129b.zip op-kernel-dev-f31e0960f395df0c9197de53674365e2a28a129b.tar.gz | |
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>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/module.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c index 7873e17..fbc0789 100644 --- a/arch/s390/kernel/module.c +++ b/arch/s390/kernel/module.c @@ -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; } |
