Commit b1983b0a authored Jun 11, 2013 by Kees Cook Committed by H. Peter Anvin Jun 12, 2013

x86, relocs: Move __vvar_page from S_ABS to S_REL



The __vvar_page relocation should actually be listed in S_REL instead
of S_ABS. Oddly, this didn't always cause things to break, presumably
because there are no users for relocation information on 64 bits yet.

[ hpa: Not for stable - new code in 3.10 ]

Signed-off-by: Kees Cook <keescook@chromium.org>
Link: http://lkml.kernel.org/r/20130611185652.GA23674@www.outflux.net


Reported-by: Michael Davidson <md@google.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

parent 7de3d66b

arch/x86/tools/relocs.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -42,9 +42,6 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = {
		"^(xen_irq_disable_direct_reloc$\|"
		"xen_save_fl_direct_reloc$\|"
		"VDSO\|"
		#if ELF_BITS == 64
		"__vvar_page\|"
		#endif
		"__crc_)",

		/*
		@@ -72,6 +69,7 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = {
		"__per_cpu_load\|"
		"init_per_cpu__.*\|"
		"__end_rodata_hpage_align\|"
		"__vvar_page\|"
		#endif
		"_end)$"
		};