linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: david.brown@linaro.org (David Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: vdso: Mark vDSO code as read-only
Date: Tue, 16 Feb 2016 14:36:59 -0700	[thread overview]
Message-ID: <20160216213659.GA47194@davidb.org> (raw)
In-Reply-To: <1453226922-16831-1-git-send-email-keescook@chromium.org>

Although the arm vDSO is cleanly separated by code/data with the code
being read-only in userspace mappings, the code page is still writable
from the kernel.  There have been exploits (such as
http://itszn.com/blog/?p=21) that take advantage of this on x86 to go
from a bad kernel write to full root.

Prevent this specific exploit on arm by putting the vDSO code page in
post-init read-only memory as well.

Before:
vdso: 1 text pages at base 80927000
root at Vexpress:/ cat /sys/kernel/debug/kernel_page_tables
---[ Modules ]---
---[ Kernel Mapping ]---
0x80000000-0x80100000           1M     RW NX SHD
0x80100000-0x80600000           5M     ro x  SHD
0x80600000-0x80800000           2M     ro NX SHD
0x80800000-0xbe000000         984M     RW NX SHD

After:
vdso: 1 text pages at base 8072b000
root at Vexpress:/ cat /sys/kernel/debug/kernel_page_tables
---[ Modules ]---
---[ Kernel Mapping ]---
0x80000000-0x80100000           1M     RW NX SHD
0x80100000-0x80600000           5M     ro x  SHD
0x80600000-0x80800000           2M     ro NX SHD
0x80800000-0xbe000000         984M     RW NX SHD

Inspired by https://lkml.org/lkml/2016/1/19/494 based on work by the
PaX Team, Brad Spengler, and Kees Cook.

Signed-off-by: David Brown <david.brown@linaro.org>
---
This patch depends on Kees Cook's series
https://lkml.org/lkml/2016/1/19/497 which adds the ro_after_init
section.

 arch/arm/vdso/vdso.S | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/vdso/vdso.S b/arch/arm/vdso/vdso.S
index b2b97e3..a62a7b6 100644
--- a/arch/arm/vdso/vdso.S
+++ b/arch/arm/vdso/vdso.S
@@ -23,9 +23,8 @@
 #include <linux/const.h>
 #include <asm/page.h>
 
-	__PAGE_ALIGNED_DATA
-
 	.globl vdso_start, vdso_end
+	.section .data..ro_after_init
 	.balign PAGE_SIZE
 vdso_start:
 	.incbin "arch/arm/vdso/vdso.so"
-- 
2.7.1

  parent reply	other threads:[~2016-02-16 21:36 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1453226922-16831-1-git-send-email-keescook@chromium.org>
     [not found] ` <1453226922-16831-4-git-send-email-keescook@chromium.org>
     [not found]   ` <20160127211105.GA41450@davidb.org>
     [not found]     ` <CAGXu5j+DLRoVE88a9++jVfEkN90HDiAaDAMnT2TrKqtMZ_yOww@mail.gmail.com>
2016-01-28  0:09       ` [PATCH] arm64: make CONFIG_DEBUG_RODATA non-optional David Brown
2016-01-28  0:14         ` Kees Cook
2016-01-28  8:20           ` Ard Biesheuvel
2016-01-28 11:06         ` Mark Rutland
2016-01-28 14:06           ` Kees Cook
2016-01-28 14:59             ` Mark Rutland
2016-01-28 15:17               ` Kees Cook
2016-02-16 21:36 ` David Brown [this message]
2016-02-16 21:52   ` [PATCH] ARM: vdso: Mark vDSO code as read-only Kees Cook
2016-02-17  5:20     ` David Brown
2016-02-17 23:00       ` Kees Cook
2016-02-17 23:43         ` David Brown
2016-02-17 23:48           ` Kees Cook
2016-02-18 10:46             ` PaX Team

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160216213659.GA47194@davidb.org \
    --to=david.brown@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).