summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@MIT.EDU>2011-08-03 09:31:49 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2011-08-04 16:13:34 -0700
commit1bdfac19b3ecfca545281c15c7aea7ebc2eaef31 (patch)
tree97e228c8e74b16451cd82fbc52abd674cda9e17e /arch/x86
parent17b0436077d99211d8b26886235a36c5ec54ac57 (diff)
downloadlinux-1bdfac19b3ecfca545281c15c7aea7ebc2eaef31.tar.bz2
x86-64: Pad vDSO to a page boundary
This avoids an information leak to userspace. Signed-off-by: Andy Lutomirski <luto@mit.edu> Link: http://lkml.kernel.org/r/a63380a3c58a0506a2f5a18ba1b12dbde1f25e58.1312378163.git.luto@mit.edu Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/vdso/vdso.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/vdso/vdso.S b/arch/x86/vdso/vdso.S
index 1b979c12ba85..01f5e3b4613c 100644
--- a/arch/x86/vdso/vdso.S
+++ b/arch/x86/vdso/vdso.S
@@ -9,6 +9,7 @@ __PAGE_ALIGNED_DATA
vdso_start:
.incbin "arch/x86/vdso/vdso.so"
vdso_end:
+ .align PAGE_SIZE /* extra data here leaks to userspace. */
.previous