diff options
| author | Kees Cook <keescook@chromium.org> | 2013-06-11 11:56:52 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-06-12 15:14:57 -0700 |
| commit | b1983b0a7578de09211a696802edab83fd253303 (patch) | |
| tree | a9e4806dc518c2f8a75cf1eafac324d4244c4e49 /arch | |
| parent | 7de3d66b1387ddf5a37d9689e5eb8510fb75c765 (diff) | |
| download | linux-stable-b1983b0a7578de09211a696802edab83fd253303.tar.gz linux-stable-b1983b0a7578de09211a696802edab83fd253303.tar.bz2 linux-stable-b1983b0a7578de09211a696802edab83fd253303.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/tools/relocs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c index 590be1090892..f7bab68a4b83 100644 --- a/arch/x86/tools/relocs.c +++ b/arch/x86/tools/relocs.c @@ -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)$" }; |