76 lines
2.2 KiB
Diff
76 lines
2.2 KiB
Diff
|
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
|
||
|
|
|