From: James Morse <james.morse@arm.com>
To: kernel-hardening@lists.openwall.com
Cc: linux-arm-kernel@lists.infradead.org,
Will Deacon <will.deacon@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
keescook@chromium.org, Mark Rutland <mark.rutland@arm.com>,
panand@redhat.com, keun-o.park@darkmatter.ae
Subject: [kernel-hardening] [PATCH v4 0/3] arm64: usercopy: Implement stack frame object validation
Date: Thu, 16 Feb 2017 18:29:14 +0000 [thread overview]
Message-ID: <20170216182917.19637-1-james.morse@arm.com> (raw)
Hi all,
This version of Sahara's arch_within_stack_frames() series replaces the
open-coded stack walker with a call to arm64's existing walker.
Patch 2 can be tested independently with this change[0].
lkdtm's use of unallocated stack regions is a separate problem, patch 3
tries to address this.
Sahara, it would be good to get your review of this!
I'm afraid I omitted your patch-3 as it stopped the lkdtm test from working,
I suspect its not tricking the compiler, but I haven't investigated.
Thanks,
James
[0] Change to lkdtm to generate accesses that overlap stack frames.
--------------%<--------------
diff --git a/drivers/misc/lkdtm_usercopy.c b/drivers/misc/lkdtm_usercopy.c
index 1dd611423d8b..fcbba3a14387 100644
--- a/drivers/misc/lkdtm_usercopy.c
+++ b/drivers/misc/lkdtm_usercopy.c
@@ -57,7 +57,8 @@ static noinline void do_usercopy_stack(bool to_user, bool bad_frame)
/* This is a pointer to outside our current stack frame. */
if (bad_frame) {
- bad_stack = do_usercopy_stack_callee((uintptr_t)&bad_stack);
+ bad_stack = __builtin_frame_address(0);
+ bad_stack -= sizeof(good_stack)/2;
} else {
/* Put start address just inside stack. */
bad_stack = task_stack_page(current) + THREAD_SIZE;
--------------%<--------------
James Morse (2):
arm64: Add arch_within_stack_frames() for hardened usercopy
arm64/uaccess: Add hardened usercopy check for bad stack accesses
Sahara (1):
usercopy: create enum stack_type
arch/arm64/Kconfig | 1 +
arch/arm64/include/asm/thread_info.h | 7 ++++-
arch/arm64/include/asm/uaccess.h | 20 +++++++++++++
arch/arm64/kernel/stacktrace.c | 54 ++++++++++++++++++++++++++++++++++--
arch/x86/include/asm/thread_info.h | 19 +++++++------
include/linux/thread_info.h | 13 +++++++--
mm/usercopy.c | 8 +-----
7 files changed, 99 insertions(+), 23 deletions(-)
--
2.10.1
next reply other threads:[~2017-02-16 18:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-16 18:29 James Morse [this message]
2017-02-16 18:29 ` [kernel-hardening] [PATCH v4 1/3] usercopy: create enum stack_type James Morse
2017-04-04 22:19 ` [kernel-hardening] " Kees Cook
2017-02-16 18:29 ` [kernel-hardening] [PATCH v4 2/3] arm64: Add arch_within_stack_frames() for hardened usercopy James Morse
2017-02-17 0:47 ` [kernel-hardening] " Kees Cook
2017-02-16 18:29 ` [kernel-hardening] [PATCH v4 3/3] arm64/uaccess: Add hardened usercopy check for bad stack accesses James Morse
2017-02-17 0:44 ` [kernel-hardening] " Kees Cook
2017-02-17 18:09 ` [kernel-hardening] " Keun-O Park
2017-03-30 8:32 ` James Morse
2017-02-17 0:54 ` [kernel-hardening] Re: [PATCH v4 0/3] arm64: usercopy: Implement stack frame object validation Kees Cook
2017-03-28 22:34 ` Kees Cook
2017-03-30 8:30 ` James Morse
2017-03-30 19:54 ` Kees Cook
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=20170216182917.19637-1-james.morse@arm.com \
--to=james.morse@arm.com \
--cc=catalin.marinas@arm.com \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=keun-o.park@darkmatter.ae \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=panand@redhat.com \
--cc=will.deacon@arm.com \
/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