From 3be6f248337da85068154de1130c684d857e331d Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Thu, 26 Mar 2009 15:24:36 +0100 Subject: [PATCH] --- yaml --- r: 135639 b: refs/heads/master c: 504665a91498f43d220b7d0942281067283a35f7 h: refs/heads/master i: 135637: af152e93e82c6f72445735a581f74d03bdbb37ba 135635: 76704d0679930c20892131e1aa72bb9fbbb0b4b9 135631: 59d711719a74fda997a0c05f16873acfbc2a2715 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/module.c | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 42fb64555148..e67000840809 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e13ed9b2704487e98d9241282765869fbd9a2dda +refs/heads/master: 504665a91498f43d220b7d0942281067283a35f7 diff --git a/trunk/arch/s390/kernel/module.c b/trunk/arch/s390/kernel/module.c index 59b4e796680a..eed4a00cb676 100644 --- a/trunk/arch/s390/kernel/module.c +++ b/trunk/arch/s390/kernel/module.c @@ -310,15 +310,20 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab, info->plt_initialized = 1; } if (r_type == R_390_PLTOFF16 || - r_type == R_390_PLTOFF32 - || r_type == R_390_PLTOFF64 - ) + r_type == R_390_PLTOFF32 || + r_type == R_390_PLTOFF64) val = me->arch.plt_offset - me->arch.got_offset + info->plt_offset + rela->r_addend; - else - val = (Elf_Addr) me->module_core + - me->arch.plt_offset + info->plt_offset + - rela->r_addend - loc; + else { + if (!((r_type == R_390_PLT16DBL && + val - loc + 0xffffUL < 0x1ffffeUL) || + (r_type == R_390_PLT32DBL && + val - loc + 0xffffffffULL < 0x1fffffffeULL))) + val = (Elf_Addr) me->module_core + + me->arch.plt_offset + + info->plt_offset; + val += rela->r_addend - loc; + } if (r_type == R_390_PLT16DBL) *(unsigned short *) loc = val >> 1; else if (r_type == R_390_PLTOFF16)