re PR sanitizer/71480 (ASan should align string constants to shadow granularity.)

2016-06-10  Maxim Ostapenko  <m.ostapenko@samsung.com>

	PR sanitizer/71480
	* varasm.c (place_block_symbol): Adjust alignment for asan protected
	STRING_CSTs even if TREE_CONSTANT_POOL_ADDRESS_P.

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

From-SVN: r237306

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 954adf379478115e6bb627d5374f2e6b63277a96..73ba814f135b914104a539ef20ab38ba16b0691c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-06-10  Maxim Ostapenko  <m.ostapenko@samsung.com>
+
+       PR sanitizer/71480
+       * varasm.c (place_block_symbol): Adjust alignment for asan protected
+       STRING_CSTs even if TREE_CONSTANT_POOL_ADDRESS_P.
+
 2016-06-10  Jan Hubicka  <hubicka@ucw.cz>
 
        * profile.c: Include cfgloop.h.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2e640a5b1893cb247fc23de1e51d5f7141eeb01e..19f379340233c4e71bcad7524b82f94cc6ea7905 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-10  Maxim Ostapenko  <m.ostapenko@samsung.com>
+
+       PR sanitizer/71480
+       * c-c++-common/asan/pr71480.c: New test.
+
 2016-06-10  H.J. Lu  <hongjiu.lu@intel.com>
 
        * gcc.dg/guality/pr68037-1.c (ASMNAME): New.

diff --git a/gcc/testsuite/c-c++-common/asan/pr71480.c b/gcc/testsuite/c-c++-common/asan/pr71480.c
new file mode 100644 (file)
index 0000000..c23ea53
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/asan/pr71480.c
@@ -0,0 +1,42 @@
+/* { dg-do run } */
+
+__attribute__ ((noinline, noclone)) int
+foo (char *c)
+{
+  asm volatile ("" : : "r" (c) : "memory");
+  return 1;
+}
+
+__attribute__ ((noinline, noclone)) void
+bar (char *c)
+{
+  asm volatile ("" : : "r" (c) : "memory");
+}
+
+int main ()
+{
+  char tpl[20] = "/tmp/test.XXXXXX";
+  char tpl2[20] = "/tmp/test.XXXXXX";
+  int fd = foo (tpl);
+  int fd2 = foo (tpl2);
+  if (fd == -1)
+    {
+      if (fd2 != -1)
+        bar (tpl2);
+      return 1;
+    }
+
+  if (fd2 == -1)
+    return 1;
+
+  bar (tpl);
+  bar (tpl2);
+
+  if (__builtin_strcmp (tpl, "/tmp/test.XXXXXX") != 0)
+    return 1;
+
+  if (__builtin_strcmp (tpl, tpl2) != 0)
+    return 1;
+
+   return 0;
+}

diff --git a/gcc/varasm.c b/gcc/varasm.c
index 4a7124e73be5fffe1b85a137e25ade1aae508e2d..de8bcd6f20c823acd03991f813da3521b80547ff 100644 (file)
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -7201,7 +7201,11 @@ place_block_symbol (rtx symbol)
       if ((flag_sanitize & SANITIZE_ADDRESS)
          && TREE_CODE (DECL_INITIAL (decl)) == STRING_CST
          && asan_protect_global (DECL_INITIAL (decl)))
-       size += asan_red_zone_size (size);
+       {
+         size += asan_red_zone_size (size);
+         alignment = MAX (alignment,
+                          ASAN_RED_ZONE_SIZE * BITS_PER_UNIT);
+       }
     }
   else
     {