Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d623f60d authored Jul 05, 2018 by Laura Abbott Committed by Masahiro Yamada Jul 18, 2018

x86: Add build salt to the vDSO



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>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

parent 9afb719e

arch/x86/entry/vdso/vdso-note.S

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3,6 +3,7 @@
	* Here we can supply some information useful to userland.		* Here we can supply some information useful to userland.
	*/		*/

			#include <linux/build-salt.h>
	#include <linux/uts.h>		#include <linux/uts.h>
	#include <linux/version.h>		#include <linux/version.h>
	#include <linux/elfnote.h>		#include <linux/elfnote.h>
	@@ -10,3 +11,5 @@
	ELFNOTE_START(Linux, 0, "a")		ELFNOTE_START(Linux, 0, "a")
	.long LINUX_VERSION_CODE		.long LINUX_VERSION_CODE
	ELFNOTE_END		ELFNOTE_END

			BUILD_SALT

arch/x86/entry/vdso/vdso32/note.S

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4,6 +4,7 @@
	* Here we can supply some information useful to userland.		* Here we can supply some information useful to userland.
	*/		*/

			#include <linux/build-salt.h>
	#include <linux/version.h>		#include <linux/version.h>
	#include <linux/elfnote.h>		#include <linux/elfnote.h>

	@@ -14,6 +15,8 @@ ELFNOTE_START(Linux, 0, "a")
	.long LINUX_VERSION_CODE		.long LINUX_VERSION_CODE
	ELFNOTE_END		ELFNOTE_END

			BUILD_SALT

	#ifdef CONFIG_XEN		#ifdef CONFIG_XEN
	/*		/*
	* Add a special note telling glibc's dynamic linker a fake hardware		* Add a special note telling glibc's dynamic linker a fake hardware