diff options
| author | Laura Abbott <labbott@redhat.com> | 2019-05-15 11:08:53 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@redhat.com> | 2019-05-15 11:08:53 -0700 |
| commit | cbd87613cc306a7ccd5ce4006daf8dc737922c3f (patch) | |
| tree | a2e2e6c5565058a3917ede82b1306c4da0f4e072 | |
| parent | 2145bfefe199ca49a5d66060af2bfd96a3004ea1 (diff) | |
| download | kernel-cbd87613cc306a7ccd5ce4006daf8dc737922c3f.tar.gz kernel-cbd87613cc306a7ccd5ce4006daf8dc737922c3f.tar.xz kernel-cbd87613cc306a7ccd5ce4006daf8dc737922c3f.zip | |
Add arm64 vdso fix
| -rw-r--r-- | 0001-arm64-vdso-Explicitly-add-build-id-option.patch | 34 | ||||
| -rw-r--r-- | kernel.spec | 3 |
2 files changed, 37 insertions, 0 deletions
diff --git a/0001-arm64-vdso-Explicitly-add-build-id-option.patch b/0001-arm64-vdso-Explicitly-add-build-id-option.patch new file mode 100644 index 000000000..2a47b0755 --- /dev/null +++ b/0001-arm64-vdso-Explicitly-add-build-id-option.patch @@ -0,0 +1,34 @@ +From a45c8a275e5e4120f4f657379ff7b805d37eac3c Mon Sep 17 00:00:00 2001 +From: Laura Abbott <labbott@redhat.com> +Date: Wed, 15 May 2019 10:54:48 -0700 +Subject: [PATCH] arm64: vdso: Explicitly add build-id option +To: Masahiro Yamada <yamada.masahiro@socionext.com> +To: Will Deacon <will.deacon@arm.com> +Cc: linux-kernel@vger.kernel.org +Cc: linux-arm-kernel@lists.infradead.org + +Commit 691efbedc60d ("arm64: vdso: use $(LD) instead of $(CC) to +link VDSO") switched to using LD explicitly. The --build-id option +needs to be passed explicitly, similar to x86. Add this option. + +Fixes: 691efbedc60d ("arm64: vdso: use $(LD) instead of $(CC) to link VDSO") +Signed-off-by: Laura Abbott <labbott@redhat.com> +--- + arch/arm64/kernel/vdso/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile +index 744b9dbaba03..ca209103cd06 100644 +--- a/arch/arm64/kernel/vdso/Makefile ++++ b/arch/arm64/kernel/vdso/Makefile +@@ -13,6 +13,7 @@ targets := $(obj-vdso) vdso.so vdso.so.dbg + obj-vdso := $(addprefix $(obj)/, $(obj-vdso)) + + ldflags-y := -shared -nostdlib -soname=linux-vdso.so.1 \ ++ $(call ld-option, --build-id) \ + $(call ld-option, --hash-style=sysv) -n -T + + # Disable gcov profiling for VDSO code +-- +2.21.0 + diff --git a/kernel.spec b/kernel.spec index ca3768792..9fbde1df8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -580,6 +580,9 @@ Patch508: KEYS-Make-use-of-platform-keyring-for-module-signature.patch # CVE-2019-3900 rhbz 1698757 1702940 Patch524: net-vhost_net-fix-possible-infinite-loop.patch +# build fix +Patch525: 0001-arm64-vdso-Explicitly-add-build-id-option.patch + # END OF PATCH DEFINITIONS %endif |