diff options
| author | Laura Abbott <labbott@redhat.com> | 2018-07-12 12:40:31 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@redhat.com> | 2018-07-12 16:15:11 -0700 |
| commit | edd5e6103200b85864a041ae99086bd37afa81d4 (patch) | |
| tree | 78aff39db03eb36d42801b89a64b3879da6c1fe0 /0002-x86-Add-build-salt-to-the-vDSO.patch | |
| parent | fbedc324c523cd44570135ff38a5a1023baee087 (diff) | |
| download | kernel-edd5e6103200b85864a041ae99086bd37afa81d4.tar.gz kernel-edd5e6103200b85864a041ae99086bd37afa81d4.tar.xz kernel-edd5e6103200b85864a041ae99086bd37afa81d4.zip | |
Proper support for parallel debuginfo and hardening flags
Diffstat (limited to '0002-x86-Add-build-salt-to-the-vDSO.patch')
| -rw-r--r-- | 0002-x86-Add-build-salt-to-the-vDSO.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/0002-x86-Add-build-salt-to-the-vDSO.patch b/0002-x86-Add-build-salt-to-the-vDSO.patch new file mode 100644 index 000000000..2b8a8f2a0 --- /dev/null +++ b/0002-x86-Add-build-salt-to-the-vDSO.patch @@ -0,0 +1,75 @@ +From 2199e4e9f81bd90ba82fcb8641a1a5911ac9c96b Mon Sep 17 00:00:00 2001 +From: Laura Abbott <labbott@redhat.com> +Date: Tue, 3 Jul 2018 15:56:14 -0700 +Subject: [PATCHv6 2/4] x86: Add build salt to the vDSO +To: Andy Lutomirski <luto@kernel.org> +To: mjw@fedoraproject.org +Cc: Linus Torvalds <torvalds@linux-foundation.org> +To: H. J. Lu <hjl.tools@gmail.com> +Cc: X86 ML <x86@kernel.org> +Cc: linux-kernel@vger.kernel.org +To: Masahiro Yamada <yamada.masahiro@socionext.com> +Cc: Nick Clifton <nickc@redhat.com> +Cc: Cary Coutant <ccoutant@gmail.com> +Cc: linux-kbuild@vger.kernel.org +Cc: linuxppc-dev@lists.ozlabs.org +Cc: Michael Ellerman <mpe@ellerman.id.au> +Cc: Catalin Marinas <catalin.marinas@arm.com> +Cc: Will Deacon <will.deacon@arm.com> +Cc: linux-arm-kernel@lists.infradead.org + + +The vDSO needs to have a unique build id in a similar manner +to the kernel and modules. Use the build salt macro. + +Acked-by: Andy Lutomirski <luto@kernel.org> +Signed-off-by: Laura Abbott <labbott@redhat.com> +--- +v6: Ack from Andy +--- + arch/x86/entry/vdso/vdso-note.S | 3 +++ + arch/x86/entry/vdso/vdso32/note.S | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/arch/x86/entry/vdso/vdso-note.S b/arch/x86/entry/vdso/vdso-note.S +index 79a071e4357e..79423170118f 100644 +--- a/arch/x86/entry/vdso/vdso-note.S ++++ b/arch/x86/entry/vdso/vdso-note.S +@@ -3,6 +3,7 @@ + * Here we can supply some information useful to userland. + */ + ++#include <linux/build-salt.h> + #include <linux/uts.h> + #include <linux/version.h> + #include <linux/elfnote.h> +@@ -10,3 +11,5 @@ + ELFNOTE_START(Linux, 0, "a") + .long LINUX_VERSION_CODE + ELFNOTE_END ++ ++BUILD_SALT +diff --git a/arch/x86/entry/vdso/vdso32/note.S b/arch/x86/entry/vdso/vdso32/note.S +index 9fd51f206314..e78047d119f6 100644 +--- a/arch/x86/entry/vdso/vdso32/note.S ++++ b/arch/x86/entry/vdso/vdso32/note.S +@@ -4,6 +4,7 @@ + * Here we can supply some information useful to userland. + */ + ++#include <linux/build-salt.h> + #include <linux/version.h> + #include <linux/elfnote.h> + +@@ -14,6 +15,8 @@ ELFNOTE_START(Linux, 0, "a") + .long LINUX_VERSION_CODE + ELFNOTE_END + ++BUILD_SALT ++ + #ifdef CONFIG_XEN + /* + * Add a special note telling glibc's dynamic linker a fake hardware +-- +2.17.1 + |