On 04/22/2015 11:31 AM, Yury Gribov wrote:
On 04/19/2015 06:11 PM, Jakub Jelinek wrote:
On Sun, Apr 19, 2015 at 10:54:57AM +0300, Yury Gribov wrote:
On 04/17/2015 08:29 PM, Andi Kleen wrote:
Yury Gribov <y.gri...@samsung.com> writes:
+
+static bool
+section_sanitized_p (const char *sec)
+{
+ if (!sanitized_sections)
+ return false;
+ size_t len = strlen (sec);
+ const char *p = sanitized_sections;
+ while ((p = strstr (p, sec)))
+ {
+ if ((p == sanitized_sections || p[-1] == ',')
+ && (p[len] == 0 || p[len] == ','))
+ return true;
No wildcard support? That may be a long option in some cases.
Right. Do you think * will be enough or we also need ? and [a-f] syntax?
libiberty contains and gcc build utilities already use fnmatch, so you
should just use that (with carefully chosen FNM_* options).
Hi all,
Here is an new patch which adds support for wildcards in
-fsanitize-sections. This also adds a test which I forgot to svn-add last time
(shame on me).
Bootstrapped and regtested on x64. Ok to commit?
Attached the patch.
commit 0438afd83e555d1d484d2bef899125a8b9b4f10a
Author: Yury Gribov <y.gri...@samsung.com>
Date: Tue Apr 21 20:47:04 2015 +0300
2015-04-22 Yury Gribov <y.gri...@samsung.com>
gcc/
* asan.c (set_sanitized_sections): Parse incoming arg.
(section_sanitized_p): Support wildcards.
* doc/invoke.texi (-fsanitize-sections): Update description.
gcc/testsuite/
* c-c++-common/asan/user-section-1.c: New test.
* c-c++-common/asan/user-section-2.c: New test.
* c-c++-common/asan/user-section-3.c: New test.
diff --git a/gcc/asan.c b/gcc/asan.c
index cd6ccdc..f7c595c 100644
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -88,6 +88,7 @@ along with GCC; see the file COPYING3. If not see
#include "ubsan.h"
#include "params.h"
#include "builtins.h"
+#include "fnmatch.h"
/* AddressSanitizer finds out-of-bounds and use-after-free bugs
with <2x slowdown on average.
@@ -272,7 +273,7 @@ along with GCC; see the file COPYING3. If not see
static unsigned HOST_WIDE_INT asan_shadow_offset_value;
static bool asan_shadow_offset_computed;
-static const char *sanitized_sections;
+static vec<char *, va_gc> *sanitized_sections;
/* Sets shadow offset to value in string VAL. */
@@ -298,9 +299,25 @@ set_asan_shadow_offset (const char *val)
/* Set list of user-defined sections that need to be sanitized. */
void
-set_sanitized_sections (const char *secs)
+set_sanitized_sections (const char *sections)
{
- sanitized_sections = secs;
+ char *pat;
+ for (unsigned i = 0;
+ sanitized_sections && sanitized_sections->iterate (i, &pat);
+ ++i)
+ {
+ free (pat);
+ }
+ vec_safe_truncate (sanitized_sections, 0);
+
+ for (const char *s = sections; *s; )
+ {
+ const char *end;
+ for (end = s; *end && *end != ','; ++end);
+ size_t len = end - s;
+ vec_safe_push (sanitized_sections, xstrndup (s, len));
+ s = *end ? end + 1 : end;
+ }
}
/* Checks whether section SEC should be sanitized. */
@@ -308,16 +325,13 @@ set_sanitized_sections (const char *secs)
static bool
section_sanitized_p (const char *sec)
{
- if (!sanitized_sections)
- return false;
- size_t len = strlen (sec);
- const char *p = sanitized_sections;
- while ((p = strstr (p, sec)))
+ char *pat;
+ for (unsigned i = 0;
+ sanitized_sections && sanitized_sections->iterate (i, &pat);
+ ++i)
{
- if ((p == sanitized_sections || p[-1] == ',')
- && (p[len] == 0 || p[len] == ','))
+ if (fnmatch (pat, sec, FNM_PERIOD) == 0)
return true;
- ++p;
}
return false;
}
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index c20dd4d..a939ff7 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -5806,7 +5806,8 @@ Kernel AddressSanitizer.
@item -fsanitize-sections=@var{s1,s2,...}
@opindex fsanitize-sections
-Sanitize global variables in selected user-defined sections.
+Sanitize global variables in selected user-defined sections. @var{si} may
+contain wildcards.
@item -fsanitize-recover@r{[}=@var{opts}@r{]}
@opindex fsanitize-recover
diff --git a/gcc/testsuite/c-c++-common/asan/user-section-1.c b/gcc/testsuite/c-c++-common/asan/user-section-1.c
new file mode 100644
index 0000000..51e2b99
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/asan/user-section-1.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-fsanitize=address -fsanitize-sections=.xxx,.yyy -fdump-tree-sanopt" } */
+/* { dg-skip-if "" { *-*-* } { "-flto" } { "" } } */
+
+int x __attribute__((section(".xxx"))) = 1;
+int y __attribute__((section(".yyy"))) = 1;
+int z __attribute__((section(".zzz"))) = 1;
+
+/* { dg-final { scan-tree-dump "__builtin___asan_unregister_globals \\(.*, 2\\);" "sanopt" } } */
+/* { dg-final { cleanup-tree-dump "sanopt" } } */
+
diff --git a/gcc/testsuite/c-c++-common/asan/user-section-2.c b/gcc/testsuite/c-c++-common/asan/user-section-2.c
new file mode 100644
index 0000000..f602116
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/asan/user-section-2.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-fsanitize=address -fsanitize-sections=.x* -fdump-tree-sanopt" } */
+/* { dg-skip-if "" { *-*-* } { "-flto" } { "" } } */
+
+int x __attribute__((section(".x1"))) = 1;
+int y __attribute__((section(".x2"))) = 1;
+int z __attribute__((section(".x3"))) = 1;
+
+/* { dg-final { scan-tree-dump "__builtin___asan_unregister_globals \\(.*, 3\\);" "sanopt" } } */
+/* { dg-final { cleanup-tree-dump "sanopt" } } */
+
diff --git a/gcc/testsuite/c-c++-common/asan/user-section-3.c b/gcc/testsuite/c-c++-common/asan/user-section-3.c
new file mode 100644
index 0000000..66e5f9a
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/asan/user-section-3.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-fsanitize=address -fsanitize-sections=.x* -fsanitize-sections=.y* -fdump-tree-sanopt" } */
+/* { dg-skip-if "" { *-*-* } { "-flto" } { "" } } */
+
+int x __attribute__((section(".x1"))) = 1;
+int y __attribute__((section(".x2"))) = 1;
+int z __attribute__((section(".y1"))) = 1;
+
+/* { dg-final { scan-tree-dump "__builtin___asan_unregister_globals \\(.*, 1\\);" "sanopt" } } */
+/* { dg-final { cleanup-tree-dump "sanopt" } } */
+
