[PATCH] x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32

[PATCH] x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32

[H.J. Lu]

Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a:

https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a

x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
32-bit PC-relative branches.  Grub2 should treat R_X86_64_PLT32 as
R_X86_64_PC32.

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
---
 grub-core/efiemu/i386/loadcore64.c | 1 +
 grub-core/kern/x86_64/dl.c         | 1 +
 util/grub-mkimagexx.c              | 1 +
 util/grub-module-verifier.c        | 1 +
 4 files changed, 4 insertions(+)

diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c
index e49d0b6ff..18facf47f 100644
--- a/grub-core/efiemu/i386/loadcore64.c
+++ b/grub-core/efiemu/i386/loadcore64.c
@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs,
 		    break;
 
 		  case R_X86_64_PC32:
+		  case R_X86_64_PLT32:
 		    err = grub_efiemu_write_value (addr,
 						   *addr32 + rel->r_addend
 						   + sym.off
diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c
index 440690673..3a73e6e6c 100644
--- a/grub-core/kern/x86_64/dl.c
+++ b/grub-core/kern/x86_64/dl.c
@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
 	  break;
 
 	case R_X86_64_PC32:
+	case R_X86_64_PLT32:
 	  {
 	    grub_int64_t value;
 	    value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value -
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
index a2bb05439..39d7efb91 100644
--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
@@ -841,6 +841,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
 		  break;
 
 		case R_X86_64_PC32:
+		case R_X86_64_PLT32:
 		  {
 		    grub_uint32_t *t32 = (grub_uint32_t *) target;
 		    *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c
index 9179285a5..a79271f66 100644
--- a/util/grub-module-verifier.c
+++ b/util/grub-module-verifier.c
@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = {
       -1
     }, (int[]){
       R_X86_64_PC32,
+      R_X86_64_PLT32,
       -1
     }
   },
-- 
2.14.3

Re: [PATCH] x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32

[Daniel Kiper]

On Sat, Feb 17, 2018 at 06:47:28AM -0800, H.J. Lu wrote:
> Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a:
>
> https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a
>
> x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
> 32-bit PC-relative branches.  Grub2 should treat R_X86_64_PLT32 as
> R_X86_64_PC32.
>
> Signed-off-by: H.J. Lu <hjl.tools@gmail.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel

Re: [PATCH] x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32

[Daniel Kiper]

On Tue, Feb 20, 2018 at 06:16:03PM +0100, Daniel Kiper wrote:
> On Sat, Feb 17, 2018 at 06:47:28AM -0800, H.J. Lu wrote:
> > Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a:
> >
> > https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a
> >
> > x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
> > 32-bit PC-relative branches.  Grub2 should treat R_X86_64_PLT32 as
> > R_X86_64_PC32.
> >
> > Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
>
> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Applied!

FYI, this is last time when I sent commit confirmation.
If I send one in the future then this will be rather
exception than rule. So, if you receive my reviewed-by
and patch is not committed in a week or two then it means
that it fallen into abyss and you have to ping me.

Have a nice weekend,

Daniel