]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
arm64: vmlinux.lds: make __rela_offset and __dynsym_offset ABSOLUTE
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Thu, 28 Jul 2016 14:15:14 +0000 (16:15 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 20 Aug 2016 16:10:50 +0000 (18:10 +0200)
commit d6732fc402c2665f61e72faf206a0268e65236e9 upstream.

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")
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm64/kernel/vmlinux.lds.S

index 435e820e898d09fae58aa52f8197558f4ecedb04..e564d45959980e384e88b738a54eded5e214381b 100644 (file)
@@ -181,9 +181,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 = .;