path: root/arch
diff options
authorGerald Schaefer <>2020-05-06 13:45:52 +0200
committerVasily Gorbik <>2020-05-20 10:13:27 +0200
commit4c1cbcbd6c56c79de2c07159be4f55386bb0bef2 (patch)
tree10a9330ab04f8e478652931c8ccd6526023cb140 /arch
parentac8372f3b4e41015549b331a4f350224661e7fc6 (diff)
s390/kaslr: add support for R_390_JMP_SLOT relocation type
With certain kernel configurations, the R_390_JMP_SLOT relocation type might be generated, which is not expected by the KASLR relocation code, and the kernel stops with the message "Unknown relocation type". This was found with a zfcpdump kernel config, where CONFIG_MODULES=n and CONFIG_VFIO=n. In that case, symbol_get() is used on undefined __weak symbols in virt/kvm/vfio.c, which results in the generation of R_390_JMP_SLOT relocation types. Fix this by handling R_390_JMP_SLOT similar to R_390_GLOB_DAT. Fixes: 805bc0bc238f ("s390/kernel: build a relocatable kernel") Cc: <> # v5.2+ Signed-off-by: Gerald Schaefer <> Reviewed-by: Philipp Rudo <> Signed-off-by: Vasily Gorbik <>
Diffstat (limited to 'arch')
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/machine_kexec_reloc.c b/arch/s390/kernel/machine_kexec_reloc.c
index d5035de9020e..b7182cec48dc 100644
--- a/arch/s390/kernel/machine_kexec_reloc.c
+++ b/arch/s390/kernel/machine_kexec_reloc.c
@@ -28,6 +28,7 @@ int arch_kexec_do_relocs(int r_type, void *loc, unsigned long val,
case R_390_64: /* Direct 64 bit. */
case R_390_GLOB_DAT:
+ case R_390_JMP_SLOT:
*(u64 *)loc = val;
case R_390_PC16: /* PC relative 16 bit. */