From 450493b5e60623a4a7c2d78261a7838b51ef6310d8dea74f1fb63c19e306ef96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Fri, 21 Sep 2018 12:20:06 +0000 Subject: [PATCH 1/2] Accepting request 634766 from home:aplanas:branches:Kernel:kdump - kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch Upstream backport. In response to a change in binutils, commit b21ebf2fb4c (x86: Treat R_X86_64_PLT32 as R_X86_64_PC32) was applied to the linux kernel during the 4.16 development cycle and has since been backported to earlier stable kernel series. The change results in the failure message in $SUBJECT when rebooting via kexec. Fix this by replicating the change in kexec. OBS-URL: https://build.opensuse.org/request/show/634766 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=103 --- ...ndled-rela-relocation-R_X86_64_PLT32.patch | 36 +++++++++++++++++++ kexec-tools.changes | 15 ++++++++ kexec-tools.spec | 4 ++- 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch diff --git a/kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch b/kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch new file mode 100644 index 0000000..777347a --- /dev/null +++ b/kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch @@ -0,0 +1,36 @@ +From b9de21ef51a7ceab7122a707c188602eae22c4ee Mon Sep 17 00:00:00 2001 +From: Chris Clayton +Date: Mon, 20 Aug 2018 12:00:31 +0100 +Subject: [PATCH] kexec: fix for "Unhandled rela relocation: R_X86_64_PLT32" + error + +In response to a change in binutils, commit b21ebf2fb4c +(x86: Treat R_X86_64_PLT32 as R_X86_64_PC32) was applied to +the linux kernel during the 4.16 development cycle and has +since been backported to earlier stable kernel series. The +change results in the failure message in $SUBJECT when +rebooting via kexec. + +Fix this by replicating the change in kexec. + +Signed-off-by: Chris Clayton +Acked-by: Baoquan He +Tested-by: Bhupesh Sharma +Acked-by: Bhupesh Sharma +Signed-off-by: Simon Horman +--- + kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c +index 7fdde73..db85b44 100644 +--- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c ++++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c +@@ -79,6 +79,7 @@ void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), + goto overflow; + break; + case R_X86_64_PC32: ++ case R_X86_64_PLT32: + *(uint32_t *)location = value - address; + break; + default: diff --git a/kexec-tools.changes b/kexec-tools.changes index a5b1646..94c9f84 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Sep 10 14:27:09 UTC 2018 - Alberto Planas Dominguez + +- kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch + Upstream backport. + + In response to a change in binutils, commit b21ebf2fb4c + (x86: Treat R_X86_64_PLT32 as R_X86_64_PC32) was applied to + the linux kernel during the 4.16 development cycle and has + since been backported to earlier stable kernel series. The + change results in the failure message in $SUBJECT when + rebooting via kexec. + + Fix this by replicating the change in kexec. + ------------------------------------------------------------------- Thu Apr 19 11:54:10 UTC 2018 - ptesarik@suse.com diff --git a/kexec-tools.spec b/kexec-tools.spec index c93e110..548ddd2 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -20,7 +20,7 @@ Name: kexec-tools Version: 2.0.17 Release: 0 Summary: Tools for loading replacement kernels into memory -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Kernel Url: https://www.kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz Source: https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/snapshot/%{name}-%{version}.tar.xz @@ -31,6 +31,7 @@ Source4: %{name}-rpmlintrc Patch2: %{name}-xen-balloon-up.patch Patch3: %{name}-disable-test.patch Patch14: %{name}-vmcoreinfo-in-xen.patch +Patch15: %{name}-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: systemd-rpm-macros @@ -57,6 +58,7 @@ the loaded kernel after it panics. %patch2 -p1 %patch3 -p1 %patch14 -p1 +%patch15 -p1 %build autoreconf -fvi From 6971e25c782cc66783db14c1a0a6bdcd638ef8ba2208a470bf52a2aaf6f6b769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Fri, 21 Sep 2018 12:22:54 +0000 Subject: [PATCH 2/2] kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch: Update header. OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=104 --- ...s-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch b/kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch index 777347a..0e91e45 100644 --- a/kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch +++ b/kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch @@ -1,8 +1,8 @@ -From b9de21ef51a7ceab7122a707c188602eae22c4ee Mon Sep 17 00:00:00 2001 From: Chris Clayton Date: Mon, 20 Aug 2018 12:00:31 +0100 -Subject: [PATCH] kexec: fix for "Unhandled rela relocation: R_X86_64_PLT32" - error +Subject: kexec: fix for "Unhandled rela relocation: R_X86_64_PLT32" error +Upstream: merged +Git-commit: b9de21ef51a7ceab7122a707c188602eae22c4ee In response to a change in binutils, commit b21ebf2fb4c (x86: Treat R_X86_64_PLT32 as R_X86_64_PC32) was applied to