mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Kees Cook <keescook@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Arnd Bergmann <arnd@arndb.de>, Ankita Garg <ankita@in.ibm.com>,
	Simon Kagstrom <simon.kagstrom@netinsight.net>,
	Kees Cook <keescook@chromium.org>
Subject: [PATCH 1/4] lkdtm: fix stack protector trigger
Date: Mon,  8 Jul 2013 10:01:30 -0700	[thread overview]
Message-ID: <1373302893-4990-1-git-send-email-keescook@chromium.org> (raw)

The -fstack-protector compiler flag will only build stack protections if
a character array is seen. Additionally, the offset to the saved
instruction pointer changes based on architecture, so stomp much harder
(64 bytes) when corrupting the stack.

Signed-off-by: Kees Cook <keescook@chromium.org>
---
 drivers/misc/lkdtm.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/misc/lkdtm.c b/drivers/misc/lkdtm.c
index 08aad69..adb6bde 100644
--- a/drivers/misc/lkdtm.c
+++ b/drivers/misc/lkdtm.c
@@ -295,10 +295,10 @@ static void lkdtm_do_action(enum ctype which)
 		(void) recursive_loop(0);
 		break;
 	case CT_CORRUPT_STACK: {
-		volatile u32 data[8];
-		volatile u32 *p = data;
+		/* Make sure the compiler creates and uses an 8 char array. */
+		volatile char data[8];
 
-		p[12] = 0x12345678;
+		memset((void *)data, 0, 64);
 		break;
 	}
 	case CT_UNALIGNED_LOAD_STORE_WRITE: {
-- 
1.7.9.5


             reply	other threads:[~2013-07-08 17:02 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-08 17:01 Kees Cook [this message]
2013-07-08 17:01 ` [PATCH 2/4] lkdtm: add "WARNING" trigger Kees Cook
2013-07-08 17:01 ` [PATCH 3/4] lkdtm: add "SPINLOCKUP" trigger Kees Cook
2013-07-08 17:01 ` [PATCH 4/4] lkdtm: add "EXEC_*" triggers Kees Cook
  -- strict thread matches above, loose matches on Subject: below --
2013-06-22 18:37 [PATCH 0/4] lkdtm: various improvements Kees Cook
2013-06-22 18:37 ` [PATCH 1/4] lkdtm: fix stack protector trigger Kees Cook
2013-07-08 13:09   ` Kees Cook
2013-07-08 16:42     ` Greg Kroah-Hartman
2013-07-08 16:59       ` 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=1373302893-4990-1-git-send-email-keescook@chromium.org \
    --to=keescook@chromium.org \
    --cc=ankita@in.ibm.com \
    --cc=arnd@arndb.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=simon.kagstrom@netinsight.net \
    /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

all inboxes | Powered by JetHome®