Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
To:     LKML <linux-kernel@vger.kernel.org>
Cc:     ben@decadent.org.uk
From:   Woody Suwalski <terraluna977@gmail.com>
Subject: [PATCH] fix 3.16 unknown rela relocation 4 error
Message-ID: <48d562fd-f80a-69ae-56e5-d0bada0feeed@gmail.com>
Date:   Sat, 25 Jan 2020 22:16:05 -0500
User-Agent: Mozilla/5.0 (X11; Linux i686; rv:52.0) Gecko/20100101 Firefox/52.0
 SeaMonkey/2.49.5
MIME-Version: 1.0
Content-Type: multipart/mixed;
 boundary="------------556E9E7D66A6EAFDDCA5DC60"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

This is a multi-part message in MIME format.
--------------556E9E7D66A6EAFDDCA5DC60
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit

Trying to use an AMD64 3.16 kernel built on a new Debian system fails 
because
most of the kernel modules can not be loaded.

This patch handles the PLT32 relocation errors for kernels modules built 
with binutils
newer then 2.31, similar to:
[    5.742485] module: autofs4: Unknown rela relocation: 4
[    5.742536] systemd[1]: Failed to insert module 'autofs4': Exec 
format error

This patch is based on a mainline kernel patch 
b21ebf2fb4cde1618915a97cc773e287ff49173e
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Wed, 7 Feb 2018 14:20:09 -0800
Subject: x86: Treat R_X86_64_PLT32 as R_X86_64_PC32

Signed-off-by: Woody Suwalski <terraluna977@gmail.com>

--- a/arch/x86/tools/relocs.c    2020-01-24 18:48:09.477919152 -0500
+++ b/arch/x86/tools/relocs.c    2020-01-24 18:48:53.645612045 -0500
@@ -763,6 +763,7 @@ static int do_reloc64(struct section *se
      switch (r_type) {
      case R_X86_64_NONE:
      case R_X86_64_PC32:
+    case R_X86_64_PLT32:
          /*
           * NONE can be ignored and PC relative relocations don't
           * need to be adjusted.
--- a/arch/x86/kernel/module.c    2020-01-24 18:46:54.922670590 -0500
+++ b/arch/x86/kernel/module.c    2020-01-24 18:47:46.714112016 -0500
@@ -180,6 +180,7 @@ int apply_relocate_add(Elf64_Shdr *sechd
                  goto overflow;
              break;
          case R_X86_64_PC32:
+        case R_X86_64_PLT32:
              val -= (u64)loc;
              *(u32 *)loc = val;
  #if 0


--------------556E9E7D66A6EAFDDCA5DC60
Content-Type: text/x-patch;
 name="reloc_PLT32_3.16.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="reloc_PLT32_3.16.diff"

Handle the PLT32 reloacation errors for kernels binaries built with binutils
newer then 2.31, similar to:
[    5.742485] module: autofs4: Unknown rela relocation: 4
[    5.742536] systemd[1]: Failed to insert module 'autofs4': Exec format error

This patch is based on a mainline kernel patch b21ebf2fb4cde1618915a97cc773e287ff49173e
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Wed, 7 Feb 2018 14:20:09 -0800
Subject: x86: Treat R_X86_64_PLT32 as R_X86_64_PC32

Signed-off-by: Woody Suwalski <terraluna977@gmail.com>

--- a/arch/x86/tools/relocs.c	2020-01-24 18:48:09.477919152 -0500
+++ b/arch/x86/tools/relocs.c	2020-01-24 18:48:53.645612045 -0500
@@ -763,6 +763,7 @@ static int do_reloc64(struct section *se
 	switch (r_type) {
 	case R_X86_64_NONE:
 	case R_X86_64_PC32:
+	case R_X86_64_PLT32:
 		/*
 		 * NONE can be ignored and PC relative relocations don't
 		 * need to be adjusted.
--- a/arch/x86/kernel/module.c	2020-01-24 18:46:54.922670590 -0500
+++ b/arch/x86/kernel/module.c	2020-01-24 18:47:46.714112016 -0500
@@ -180,6 +180,7 @@ int apply_relocate_add(Elf64_Shdr *sechd
 				goto overflow;
 			break;
 		case R_X86_64_PC32:
+		case R_X86_64_PLT32:
 			val -= (u64)loc;
 			*(u32 *)loc = val;
 #if 0

--------------556E9E7D66A6EAFDDCA5DC60--