diff options
| author | Andy Lutomirski <[email protected]> | 2011-06-05 13:50:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2011-06-06 09:43:14 +0200 |
| commit | 5dfcea629a08b4684a019cd0cb59d0c9129a6c02 (patch) | |
| tree | 0f8c7ae0db1cc4d7bf75dc7dd5612de7c741145c | |
| parent | bb5fe2f78eadf5a52d8dcbf9a57728fd107af97b (diff) | |
x86-64: Fill unused parts of the vsyscall page with 0xcc
Jumping to 0x00 might do something depending on the following
bytes. Jumping to 0xcc is a trap. So fill the unused parts of
the vsyscall page with 0xcc to make it useless for exploits to
jump there.
Signed-off-by: Andy Lutomirski <[email protected]>
Cc: Jesper Juhl <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Arjan van de Ven <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: richard -rw- weinberger <[email protected]>
Cc: Mikael Pettersson <[email protected]>
Cc: Andi Kleen <[email protected]>
Cc: Brian Gerst <[email protected]>
Cc: Louis Rilling <[email protected]>
Cc: [email protected]
Cc: [email protected]
Link: http://lkml.kernel.org/r/ed54bfcfbe50a9070d20ec1edbe0d149e22a4568.1307292171.git.luto@mit.edu
Signed-off-by: Ingo Molnar <[email protected]>
| -rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 4f90082fd640..80174719910c 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -166,22 +166,20 @@ SECTIONS __vsyscall_0 = .; . = VSYSCALL_ADDR; - .vsyscall_0 : AT(VLOAD(.vsyscall_0)) { + .vsyscall : AT(VLOAD(.vsyscall)) { *(.vsyscall_0) - } :user - . = ALIGN(L1_CACHE_BYTES); - .vsyscall_fn : AT(VLOAD(.vsyscall_fn)) { + . = ALIGN(L1_CACHE_BYTES); *(.vsyscall_fn) - } - .vsyscall_1 ADDR(.vsyscall_0) + 1024: AT(VLOAD(.vsyscall_1)) { + . = 1024; *(.vsyscall_1) - } - .vsyscall_2 ADDR(.vsyscall_0) + 2048: AT(VLOAD(.vsyscall_2)) { + + . = 2048; *(.vsyscall_2) - } + . = 4096; /* Pad the whole page. */ + } :user =0xcc . = ALIGN(__vsyscall_0 + PAGE_SIZE, PAGE_SIZE); #undef VSYSCALL_ADDR |