procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cherry-pick libsanitizer pointer-pair tristate option.

Browse source 
2018-02-05  Martin Liska  <mliska@suse.cz>

	* doc/invoke.texi: Cherry-pick upstream r323995.
2018-02-05  Martin Liska  <mliska@suse.cz>

	* c-c++-common/asan/pointer-compare-1.c: Adjust ASAN_OPTIONS
	options.
	* c-c++-common/asan/pointer-compare-2.c: Likewise.
	* c-c++-common/asan/pointer-subtract-1.c: Likewise.
	* c-c++-common/asan/pointer-subtract-2.c: Likewise.
	* c-c++-common/asan/pointer-subtract-3.c: Likewise.
	* c-c++-common/asan/pointer-subtract-4.c: Likewise.
	* c-c++-common/asan/pointer-compare-3.c: New test.
2018-02-05  Martin Liska  <mliska@suse.cz>

	* asan/asan_flags.inc: Cherry-pick upstream r323995.
	* asan/asan_report.cc (CheckForInvalidPointerPair):
	Cherry-pick upstream r323995.

From-SVN: r257387
This commit is contained in:
Martin Liska 2018-02-05 12:01:50 +01:00 • committed by Martin Liska
parent ba26157992
commit 4c4f3c3fef
13 changed files with 80 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/ChangeLog
View file

@ -1,3 +1,7 @@
2018-02-05 Martin Liska <mliska@suse.cz>
* doc/invoke.texi: Cherry-pick upstream r323995.
2018-02-05 Richard Sandiford <richard.sandiford@linaro.org>
* ira.c (ira_init_register_move_cost): Adjust comment.

10
gcc/doc/invoke.texi
View file

@ -11165,8 +11165,9 @@ The option must be combined with either @option{-fsanitize=kernel-address} or
The option cannot be combined with @option{-fsanitize=thread}
and/or @option{-fcheck-pointer-bounds}.
Note: By default the check is disabled at run time. To enable it,
add @code{detect_invalid_pointer_pairs=1} to the environment variable
@env{ASAN_OPTIONS}.
add @code{detect_invalid_pointer_pairs=2} to the environment variable
@env{ASAN_OPTIONS}. Using @code{detect_invalid_pointer_pairs=1} detects
invalid operation only when both pointers are non-null.
@item -fsanitize=pointer-subtract
@opindex fsanitize=pointer-subtract
@ -11176,8 +11177,9 @@ The option must be combined with either @option{-fsanitize=kernel-address} or
The option cannot be combined with @option{-fsanitize=thread}
and/or @option{-fcheck-pointer-bounds}.
Note: By default the check is disabled at run time. To enable it,
add @code{detect_invalid_pointer_pairs=1} to the environment variable
@env{ASAN_OPTIONS}.
add @code{detect_invalid_pointer_pairs=2} to the environment variable
@env{ASAN_OPTIONS}. Using @code{detect_invalid_pointer_pairs=1} detects
invalid operation only when both pointers are non-null.
@item -fsanitize=thread
@opindex fsanitize=thread

11
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,14 @@
2018-02-05 Martin Liska <mliska@suse.cz>
* c-c++-common/asan/pointer-compare-1.c: Adjust ASAN_OPTIONS
options.
* c-c++-common/asan/pointer-compare-2.c: Likewise.
* c-c++-common/asan/pointer-subtract-1.c: Likewise.
* c-c++-common/asan/pointer-subtract-2.c: Likewise.
* c-c++-common/asan/pointer-subtract-3.c: Likewise.
* c-c++-common/asan/pointer-subtract-4.c: Likewise.
* c-c++-common/asan/pointer-compare-3.c: New test.
2018-02-05 Richard Sandiford <richard.sandiford@linaro.org>
* gcc.target/aarch64/sve/vcond_4.c: Remove XFAILs.

2
gcc/testsuite/c-c++-common/asan/pointer-compare-1.c
View file

@ -1,5 +1,5 @@
/* { dg-do run } */
/* { dg-set-target-env-var ASAN_OPTIONS "detect_invalid_pointer_pairs=1:halt_on_error=0" } */
/* { dg-set-target-env-var ASAN_OPTIONS "detect_invalid_pointer_pairs=2:halt_on_error=0" } */
/* { dg-options "-fsanitize=address,pointer-compare" } */
volatile int v;

2
gcc/testsuite/c-c++-common/asan/pointer-compare-2.c
View file

@ -1,5 +1,5 @@
/* { dg-do run } */
/* { dg-set-target-env-var ASAN_OPTIONS "detect_invalid_pointer_pairs=1 halt_on_error=1" } */
/* { dg-set-target-env-var ASAN_OPTIONS "detect_invalid_pointer_pairs=2 halt_on_error=1" } */
/* { dg-options "-fsanitize=address,pointer-compare" } */
volatile int v;

39
gcc/testsuite/c-c++-common/asan/pointer-compare-3.c Normal file
View file

@ -0,0 +1,39 @@
/* { dg-do run } */
/* { dg-set-target-env-var ASAN_OPTIONS "detect_invalid_pointer_pairs=1:halt_on_error=1" } */
/* { dg-options "-fsanitize=address,pointer-compare" } */
int foo(char *p, char *q) {
return p <= q;
}
char global[8192] = {};
char small_global[7] = {};
int main() {
// Heap allocated memory.
char *p = (char *)__builtin_malloc(42);
int r = foo(p, 0);
__builtin_free(p);
p = (char *)__builtin_malloc(1024);
foo(0, p);
__builtin_free(p);
p = (char *)__builtin_malloc(4096);
foo(p, 0);
__builtin_free(p);
// Global variable.
foo(&global[0], 0);
foo(&global[1000], 0);
p = &small_global[0];
foo(p, 0);
// Stack variable.
char stack[10000];
foo(&stack[0], 0);
foo(0, &stack[9000]);
return 0;
}

2
gcc/testsuite/c-c++-common/asan/pointer-subtract-1.c
View file

@ -1,5 +1,5 @@
/* { dg-do run } */
/* { dg-set-target-env-var ASAN_OPTIONS "detect_invalid_pointer_pairs=1 halt_on_error=0" } */
/* { dg-set-target-env-var ASAN_OPTIONS "detect_invalid_pointer_pairs=2 halt_on_error=0" } */
/* { dg-options "-fsanitize=address,pointer-subtract" } */
volatile __PTRDIFF_TYPE__ v;

2
gcc/testsuite/c-c++-common/asan/pointer-subtract-2.c
View file

@ -1,5 +1,5 @@
/* { dg-do run } */
/* { dg-set-target-env-var ASAN_OPTIONS "detect_invalid_pointer_pairs=1 halt_on_error=1" } */
/* { dg-set-target-env-var ASAN_OPTIONS "detect_invalid_pointer_pairs=2 halt_on_error=1" } */
/* { dg-options "-fsanitize=address,pointer-subtract" } */
volatile __PTRDIFF_TYPE__ v;

2
gcc/testsuite/c-c++-common/asan/pointer-subtract-3.c
View file

@ -1,5 +1,5 @@
/* { dg-do run { target pthread_h } } */
/* { dg-set-target-env-var ASAN_OPTIONS "detect_invalid_pointer_pairs=1:halt_on_error=1" } */
/* { dg-set-target-env-var ASAN_OPTIONS "detect_invalid_pointer_pairs=2:halt_on_error=1" } */
/* { dg-options "-fsanitize=address,pointer-subtract" } */
/* { dg-additional-options "-pthread" { target pthread } } */

2
gcc/testsuite/c-c++-common/asan/pointer-subtract-4.c
View file

@ -1,6 +1,6 @@
/* { dg-do run { target pthread_h } } */
/* { dg-shouldfail "asan" } */
/* { dg-set-target-env-var ASAN_OPTIONS "detect_invalid_pointer_pairs=1:halt_on_error=1" } */
/* { dg-set-target-env-var ASAN_OPTIONS "detect_invalid_pointer_pairs=2:halt_on_error=1" } */
/* { dg-options "-fsanitize=address,pointer-subtract" } */
/* { dg-additional-options "-pthread" { target pthread } } */

6
libsanitizer/ChangeLog
View file

@ -1,3 +1,9 @@
2018-02-05 Martin Liska <mliska@suse.cz>
* asan/asan_flags.inc: Cherry-pick upstream r323995.
* asan/asan_report.cc (CheckForInvalidPointerPair):
Cherry-pick upstream r323995.
2018-01-17 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR sanitizer/82825

6
libsanitizer/asan/asan_flags.inc
View file

@ -134,9 +134,9 @@ ASAN_FLAG(
"Android. ")
ASAN_FLAG(
int, detect_invalid_pointer_pairs, 0,
"If non-zero, try to detect operations like <, <=, >, >= and - on "
"invalid pointer pairs (e.g. when pointers belong to different objects). "
"The bigger the value the harder we try.")
"If >= 2, detect operations like <, <=, >, >= and - on invalid pointer "
"pairs (e.g. when pointers belong to different objects); "
"If == 1, detect invalid operations only when both pointers are non-null.")
ASAN_FLAG(
bool, detect_container_overflow, true,
"If true, honor the container overflow annotations. See "

6
libsanitizer/asan/asan_report.cc
View file

@ -340,7 +340,11 @@ static bool IsInvalidPointerPair(uptr a1, uptr a2) {
}
static INLINE void CheckForInvalidPointerPair(void *p1, void *p2) {
if (!flags()->detect_invalid_pointer_pairs) return;
switch (flags()->detect_invalid_pointer_pairs) {
case 0 : return;
case 1 : if (p1 == nullptr || p2 == nullptr) return; break;
}
uptr a1 = reinterpret_cast<uptr>(p1);
uptr a2 = reinterpret_cast<uptr>(p2);