mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-29 22:14:41 +08:00
b7ede5a1f5
Since commit35fa91eed8("ARM: kernel: merge core and init PLTs"), the ARM module PLT code allocates all PLT entries in a single core section, since the overhead of having a separate init PLT section is not justified by the small number of PLT entries usually required for init code. However, the core and init module regions are allocated independently, and there is a corner case where the core region may be allocated from the VMALLOC region if the dedicated module region is exhausted, but the init region, being much smaller, can still be allocated from the module region. This puts the PLT entries out of reach of the relocated branch instructions, defeating the whole purpose of PLTs. So split the core and init PLT regions, and name the latter ".init.plt" so it gets allocated along with (and sufficiently close to) the .init sections that it serves. Also, given that init PLT entries may need to be emitted for branches that target the core module, modify the logic that disregards defined symbols to only disregard symbols that are defined in the same section. Fixes:35fa91eed8("ARM: kernel: merge core and init PLTs") Cc: <stable@vger.kernel.org> # v4.9+ Reported-by: Angus Clark <angus@angusclark.org> Tested-by: Angus Clark <angus@angusclark.org> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
63 lines
1.3 KiB
C
63 lines
1.3 KiB
C
#ifndef _ASM_ARM_MODULE_H
|
|
#define _ASM_ARM_MODULE_H
|
|
|
|
#include <asm-generic/module.h>
|
|
|
|
struct unwind_table;
|
|
|
|
#ifdef CONFIG_ARM_UNWIND
|
|
enum {
|
|
ARM_SEC_INIT,
|
|
ARM_SEC_DEVINIT,
|
|
ARM_SEC_CORE,
|
|
ARM_SEC_EXIT,
|
|
ARM_SEC_DEVEXIT,
|
|
ARM_SEC_HOT,
|
|
ARM_SEC_UNLIKELY,
|
|
ARM_SEC_MAX,
|
|
};
|
|
#endif
|
|
|
|
struct mod_plt_sec {
|
|
struct elf32_shdr *plt;
|
|
int plt_count;
|
|
};
|
|
|
|
struct mod_arch_specific {
|
|
#ifdef CONFIG_ARM_UNWIND
|
|
struct unwind_table *unwind[ARM_SEC_MAX];
|
|
#endif
|
|
#ifdef CONFIG_ARM_MODULE_PLTS
|
|
struct mod_plt_sec core;
|
|
struct mod_plt_sec init;
|
|
#endif
|
|
};
|
|
|
|
u32 get_module_plt(struct module *mod, unsigned long loc, Elf32_Addr val);
|
|
|
|
/*
|
|
* Add the ARM architecture version to the version magic string
|
|
*/
|
|
#define MODULE_ARCH_VERMAGIC_ARMVSN "ARMv" __stringify(__LINUX_ARM_ARCH__) " "
|
|
|
|
/* Add __virt_to_phys patching state as well */
|
|
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT
|
|
#define MODULE_ARCH_VERMAGIC_P2V "p2v8 "
|
|
#else
|
|
#define MODULE_ARCH_VERMAGIC_P2V ""
|
|
#endif
|
|
|
|
/* Add instruction set architecture tag to distinguish ARM/Thumb kernels */
|
|
#ifdef CONFIG_THUMB2_KERNEL
|
|
#define MODULE_ARCH_VERMAGIC_ARMTHUMB "thumb2 "
|
|
#else
|
|
#define MODULE_ARCH_VERMAGIC_ARMTHUMB ""
|
|
#endif
|
|
|
|
#define MODULE_ARCH_VERMAGIC \
|
|
MODULE_ARCH_VERMAGIC_ARMVSN \
|
|
MODULE_ARCH_VERMAGIC_ARMTHUMB \
|
|
MODULE_ARCH_VERMAGIC_P2V
|
|
|
|
#endif /* _ASM_ARM_MODULE_H */
|