x86, relocs: move __vvar_page from S_ABS to S_REL
PATCH 1/1 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.
Signed-off-by Kees Cook <[email protected]>
Reported-by Michael Davidson <[email protected]>
--- arch/x86/tools/relocs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/x86/tools/relocs.c +1 -3
@@ -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)$" };
Signature · 6 lines
1.7.9.5 -- Kees Cook Chrome OS Security
tip-bot for Kees Cook
merge bot[tip:x86/urgent] x86, relocs: Move __vvar_page from S_ABS to S_REL
x86, relocs: Move __vvar_page from S_ABS to S_REL
Commit-ID: b1983b0a7578de09211a696802edab83fd253303 Gitweb: http://git.kernel.org/tip/b1983b0a7578de09211a696802edab83fd253303 Author: Kees Cook <[email protected]> AuthorDate: Tue, 11 Jun 2013 11:56:52 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Wed, 12 Jun 2013 15:14:57 -0700
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 <[email protected]>
Reported-by Michael Davidson <[email protected]>
Signed-off-by H. Peter Anvin <[email protected]>
--- arch/x86/tools/relocs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/x86/tools/relocs.c +1 -3
@@ -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)$" };