diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2015-02-20 10:58:59 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-02-26 09:24:45 +0100 |
| commit | 6f367769e3979ac399078f3aea020f1bbe9a2f79 (patch) | |
| tree | b87a5849cee01cb918e88073e8688655555ee65a | |
| parent | Merge tag 'stable/for-linus-4.0-rc1-tag' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | linux-6f367769e3979ac399078f3aea020f1bbe9a2f79.tar.xz linux-6f367769e3979ac399078f3aea020f1bbe9a2f79.zip | |
s390/jump label: add missing jump_label_apply_nops() call
When modules are loaded we want to transform the compile time generated
nops into runtime generated nops. Otherwise the jump label sanity check
will detect invalid code when trying to patch code.
Fixes this crash:
Jump label code mismatch at __rds_conn_create+0x3c/0x720
Found: c0 04 00 00 00 01
Expected: c0 04 00 00 00 00
Kernel panic - not syncing: Corrupted kernel text
CPU: 0 PID: 10 Comm: migration/0 Not tainted 3.19.0-01935-g006610f #14
Call Trace:
<0000000000113260> show_trace+0xf8/0x158)
<000000000011332a> show_stack+0x6a/0xe8
<000000000069fd64> dump_stack+0x7c/0xd8
<0000000000698d54> panic+0xe4/0x288
<00000000006984c6> jump_label_bug.isra.2+0xbe/0xc001
<000000000011200c> __jump_label_transform+0x94/0xc8
Reported-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | arch/s390/kernel/module.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c index 36154a2f1814..2ca95862e336 100644 --- a/arch/s390/kernel/module.c +++ b/arch/s390/kernel/module.c @@ -436,6 +436,7 @@ int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, struct module *me) { + jump_label_apply_nops(me); vfree(me->arch.syminfo); me->arch.syminfo = NULL; return 0; |