From: Laura Abbott <labbott@redhat.com>
To: Andy Lutomirski <luto@kernel.org>,
mjw@fedoraproject.org, "H . J . Lu" <hjl.tools@gmail.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Laura Abbott <labbott@redhat.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
X86 ML <x86@kernel.org>,
linux-kernel@vger.kernel.org, Nick Clifton <nickc@redhat.com>,
Cary Coutant <ccoutant@gmail.com>,
linux-kbuild@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
Michael Ellerman <mpe@ellerman.id.au>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCHv5 2/4] x86: Add build salt to the vDSO
Date: Tue, 3 Jul 2018 16:34:28 -0700 [thread overview]
Message-ID: <20180703233430.14416-3-labbott@redhat.com> (raw)
In-Reply-To: <20180703233430.14416-1-labbott@redhat.com>
The vDSO needs to have a unique build id in a similar manner
to the kernel and modules. Use the build salt macro.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v5: Switched to using the single line BUILD_SALT macro
---
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
next prev parent reply other threads:[~2018-07-03 23:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-03 23:34 [PATCHv5 0/4] Salted build ids via ELF notes Laura Abbott
2018-07-03 23:34 ` [PATCHv5 1/4] kbuild: Add build salt to the kernel and modules Laura Abbott
2018-07-04 3:59 ` Masahiro Yamada
2018-07-05 19:20 ` Laura Abbott
2018-07-03 23:34 ` Laura Abbott [this message]
2018-07-05 15:58 ` [PATCHv5 2/4] x86: Add build salt to the vDSO Andy Lutomirski
2018-07-05 19:08 ` Laura Abbott
2018-07-05 21:46 ` Andy Lutomirski
2018-07-03 23:34 ` [PATCHv5 3/4] powerpc: " Laura Abbott
2018-07-03 23:34 ` [PATCHv5 4/4] arm64: " Laura Abbott
2018-07-04 3:55 ` Masahiro Yamada
2018-07-05 19:05 ` Laura Abbott
2018-07-04 17:36 ` Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180703233430.14416-3-labbott@redhat.com \
--to=labbott@redhat.com \
--cc=catalin.marinas@arm.com \
--cc=ccoutant@gmail.com \
--cc=hjl.tools@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=luto@kernel.org \
--cc=mjw@fedoraproject.org \
--cc=mpe@ellerman.id.au \
--cc=nickc@redhat.com \
--cc=torvalds@linux-foundation.org \
--cc=will.deacon@arm.com \
--cc=x86@kernel.org \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).