[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Mon, 6 Jun 2011 08:34:02 GMT
From: tip-bot for Andy Lutomirski <luto@....EDU>
To: linux-tip-commits@...r.kernel.org
Cc: mingo@...hat.com, brgerst@...il.com, torvalds@...ux-foundation.org,
mikpe@...uu.se, richard.weinberger@...il.com, jj@...osbits.net,
JBeulich@...ell.com, tglx@...utronix.de, Louis.Rilling@...labs.com,
luto@....EDU, hpa@...or.com, linux-kernel@...r.kernel.org,
luto@....EDU, andi@...stfloor.org, bp@...en8.de,
arjan@...radead.org, mingo@...e.hu
Subject: [tip:x86/vdso] x86-64: Fill unused parts of the vsyscall page with 0xcc
Commit-ID: 5dfcea629a08b4684a019cd0cb59d0c9129a6c02
Gitweb: http://git.kernel.org/tip/5dfcea629a08b4684a019cd0cb59d0c9129a6c02
Author: Andy Lutomirski <luto@....EDU>
AuthorDate: Sun, 5 Jun 2011 13:50:23 -0400
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Mon, 6 Jun 2011 09:43:14 +0200
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 <luto@....edu>
Cc: Jesper Juhl <jj@...osbits.net>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Arjan van de Ven <arjan@...radead.org>
Cc: Jan Beulich <JBeulich@...ell.com>
Cc: richard -rw- weinberger <richard.weinberger@...il.com>
Cc: Mikael Pettersson <mikpe@...uu.se>
Cc: Andi Kleen <andi@...stfloor.org>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Louis Rilling <Louis.Rilling@...labs.com>
Cc: Valdis.Kletnieks@...edu
Cc: pageexec@...email.hu
Link: http://lkml.kernel.org/r/ed54bfcfbe50a9070d20ec1edbe0d149e22a4568.1307292171.git.luto@mit.edu
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
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 4f90082..8017471 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists