diff options
| author | Gerald Schaefer <gerald.schaefer@de.ibm.com> | 2019-10-21 20:56:00 +0300 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2019-10-22 18:55:51 +0300 |
| commit | ac49303d9ef0ad98b79867a380ef23480e48870b (patch) | |
| tree | 712a6f50423cbf0bf3bd3e99a56789cf8b00dacc /arch/s390/kernel | |
| parent | 388bb19be8eab4674a660e0c97eaf60775362bc7 (diff) | |
| download | linux-ac49303d9ef0ad98b79867a380ef23480e48870b.tar.xz | |
s390/kaslr: add support for R_390_GLOB_DAT relocation type
Commit "bpf: Process in-kernel BTF" in linux-next introduced an undefined
__weak symbol, which results in an R_390_GLOB_DAT relocation type. That
is not yet handled by the KASLR relocation code, and the kernel stops with
the message "Unknown relocation type".
Add code to detect and handle R_390_GLOB_DAT relocation types and undefined
symbols.
Fixes: 805bc0bc238f ("s390/kernel: build a relocatable kernel")
Cc: <stable@vger.kernel.org> # v5.2+
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/kernel')
| -rw-r--r-- | arch/s390/kernel/machine_kexec_reloc.c | 1 |
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 3b664cb3ec4d..d5035de9020e 100644 --- a/arch/s390/kernel/machine_kexec_reloc.c +++ b/arch/s390/kernel/machine_kexec_reloc.c @@ -27,6 +27,7 @@ int arch_kexec_do_relocs(int r_type, void *loc, unsigned long val, *(u32 *)loc = val; break; case R_390_64: /* Direct 64 bit. */ + case R_390_GLOB_DAT: *(u64 *)loc = val; break; case R_390_PC16: /* PC relative 16 bit. */ |