1 files changed, 12 insertions, 7 deletions

diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
index 59b4e796680a..eed4a00cb676 100644
--- a/arch/s390/kernel/module.c
+++ b/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)