diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-07-28 16:15:14 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2016-07-29 10:44:53 +0100 |
| commit | d6732fc402c2665f61e72faf206a0268e65236e9 (patch) | |
| tree | b092f892064282da30f0ae414fc6f85bb3a60237 /arch/arm64 | |
| parent | fd6380b75065fd2ff51b5f7cbbe6be77d71ea9c7 (diff) | |
| download | linux-stable-d6732fc402c2665f61e72faf206a0268e65236e9.tar.gz linux-stable-d6732fc402c2665f61e72faf206a0268e65236e9.tar.bz2 linux-stable-d6732fc402c2665f61e72faf206a0268e65236e9.zip | |
arm64: vmlinux.lds: make __rela_offset and __dynsym_offset ABSOLUTE
Due to the untyped KIMAGE_VADDR constant, the linker may not notice
that the __rela_offset and __dynsym_offset expressions are absolute
values (i.e., are not subject to relocation). This does not matter for
KASLR, but it does confuse kallsyms in relative mode, since it uses
the lowest non-absolute symbol address as the anchor point, and expects
all other symbol addresses to be within 4 GB of it.
Fix this by qualifying these expressions as ABSOLUTE() explicitly.
Fixes: 0cd3defe0af4 ("arm64: kernel: perform relocation processing from ID map")
Cc: <stable@vger.kernel.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/vmlinux.lds.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index 89d6e177ecbd..d49492179967 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -184,9 +184,9 @@ SECTIONS *(.hash) } - __rela_offset = ADDR(.rela) - KIMAGE_VADDR; + __rela_offset = ABSOLUTE(ADDR(.rela) - KIMAGE_VADDR); __rela_size = SIZEOF(.rela); - __dynsym_offset = ADDR(.dynsym) - KIMAGE_VADDR; + __dynsym_offset = ABSOLUTE(ADDR(.dynsym) - KIMAGE_VADDR); . = ALIGN(SEGMENT_ALIGN); __init_end = .; |