public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Jakub Jelinek <jakub@redhat.com>
To: Richard Biener <rguenther@suse.de>
Cc: gcc-patches@gcc.gnu.org
Subject: [PATCH] Fix -fsanitize=address -fstack-protector* (PR sanitizer/88333)
Date: Tue, 04 Dec 2018 23:32:00 -0000	[thread overview]
Message-ID: <20181204233223.GE12380@tucnak> (raw)

Hi!

The current asan.c code requires that the whole block of vars starts and
ends on ASAN_RED_ZONE_SIZE (i.e. 32 byte) boundary, so that it is on 4 byte
boundary in the shadow memory.  Normally it is, when frame_offset starts at
0, but with -fstack-protector there is the guard above it and in that case
following patch is needed to realign the end of the block.

Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?

2018-12-04  Jakub Jelinek  <jakub@redhat.com>

	PR sanitizer/88333
	* cfgexpand.c (expand_stack_vars): If asan_vec is empty, start with
	aligning frame offset to ASAN_RED_ZONE_SIZE bytes.

	* c-c++-common/asan/pr88333.c: New test.

--- gcc/cfgexpand.c.jj	2018-11-30 19:59:59.676789914 +0100
+++ gcc/cfgexpand.c	2018-12-04 11:25:55.549672029 +0100
@@ -1124,6 +1124,11 @@ expand_stack_vars (bool (*pred) (size_t)
 	      && frame_offset.is_constant (&prev_offset)
 	      && stack_vars[i].size.is_constant ())
 	    {
+	      if (data->asan_vec.is_empty ())
+		{
+		  alloc_stack_frame_space (0, ASAN_RED_ZONE_SIZE);
+		  prev_offset = frame_offset.to_constant ();
+		}
 	      prev_offset = align_base (prev_offset,
 					MAX (alignb, ASAN_MIN_RED_ZONE_SIZE),
 					!FRAME_GROWS_DOWNWARD);
--- gcc/testsuite/c-c++-common/asan/pr88333.c.jj	2018-12-04 12:14:44.329877625 +0100
+++ gcc/testsuite/c-c++-common/asan/pr88333.c	2018-12-04 12:14:34.804033303 +0100
@@ -0,0 +1,12 @@
+/* PR sanitizer/88333 */
+/* { dg-do compile { target fstack_protector } } */
+/* { dg-options "-fstack-protector-strong -fsanitize=address" } */
+
+void bar (int *);
+
+void
+foo (void)
+{
+  int c;
+  bar (&c);
+}

	Jakub

             reply	other threads:[~2018-12-04 23:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-04 23:32 Jakub Jelinek [this message]
2018-12-05  3:19 ` Jeff Law

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=20181204233223.GE12380@tucnak \
    --to=jakub@redhat.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=rguenther@suse.de \
    /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 read-only IMAP folder(s) and NNTP newsgroup(s).