xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390/module: fix loading modules with a lot of relocations

Browse Source 
commit f3b7e73b2c6619884351a3a0a7468642f852b8a2 upstream.

If the size of the PLT entries generated by apply_rela() exceeds
64KiB, the first ones can no longer reach __jump_r1 with brc. Fix by
using brcl. An alternative solution is to add a __jump_r1 copy after
every 64KiB, however, the space savings are quite small and do not
justify the additional complexity.

Fixes: f19fbd5ed6 ("s390: introduce execute-trampolines for branches")
Cc: stable@vger.kernel.org
Reported-by: Andrea Righi <andrea.righi@canonical.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ilya Leoshkevich
2022-01-19 19:26:37 +01:00
committed by Greg Kroah-Hartman
parent ba7c71a777
commit c10e0627c7
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
arch/s390/kernel/module.c
View File

@@ -30,7 +30,7 @@
#define DEBUGP(fmt , ...) #define DEBUGP(fmt , ...)
#endif #endif
#define PLT_ENTRY_SIZE 20 #define PLT_ENTRY_SIZE 22
void *module_alloc(unsigned long size) void *module_alloc(unsigned long size)
{ {
@@ -330,27 +330,26 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
case R_390_PLTOFF32: /* 32 bit offset from GOT to PLT. */ case R_390_PLTOFF32: /* 32 bit offset from GOT to PLT. */
case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */ case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
if (info->plt_initialized == 0) { if (info->plt_initialized == 0) {
unsigned int insn[5]; unsigned char insn[PLT_ENTRY_SIZE];
unsigned int *ip = me->core_layout.base + char *plt_base;
me->arch.plt_offset + char *ip;
info->plt_offset;
insn[0] = 0x0d10e310; /* basr 1,0 */ plt_base = me->core_layout.base + me->arch.plt_offset;
insn[1] = 0x100a0004; /* lg 1,10(1) */ ip = plt_base + info->plt_offset;
*(int *)insn = 0x0d10e310; /* basr 1,0 */
*(int *)&insn[4] = 0x100c0004; /* lg 1,12(1) */
if (IS_ENABLED(CONFIG_EXPOLINE) && !nospec_disable) { if (IS_ENABLED(CONFIG_EXPOLINE) && !nospec_disable) {
unsigned int *ij; char *jump_r1;
ij = me->core_layout.base +
me->arch.plt_offset + jump_r1 = plt_base + me->arch.plt_size -
me->arch.plt_size - PLT_ENTRY_SIZE; PLT_ENTRY_SIZE;
insn[2] = 0xa7f40000 + /* j __jump_r1 */ /* brcl 0xf,__jump_r1 */
(unsigned int)(u16) *(short *)&insn[8] = 0xc0f4;
(((unsigned long) ij - 8 - *(int *)&insn[10] = (jump_r1 - (ip + 8)) / 2;
(unsigned long) ip) / 2);
} else { } else {
insn[2] = 0x07f10000; /* br %r1 */ *(int *)&insn[8] = 0x07f10000; /* br %r1 */
} }
insn[3] = (unsigned int) (val >> 32); *(long *)&insn[14] = val;
insn[4] = (unsigned int) val;
write(ip, insn, sizeof(insn)); write(ip, insn, sizeof(insn));
info->plt_initialized = 1; info->plt_initialized = 1;