diff options
| author | Martin Liska <mliska@suse.cz> | 2017-04-11 15:08:08 +0200 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2017-04-11 13:08:08 +0000 |
| commit | 9f679370006ed036fb1545ebc272d4f1b39641a3 (patch) | |
| tree | 9c3575235036b0618e6b6a16c1b0684a79a4c3fd /gcc | |
| parent | cb278caa18841ee7a15adab8ca8bb1e99dbb3117 (diff) | |
| download | gcc-9f679370006ed036fb1545ebc272d4f1b39641a3.zip gcc-9f679370006ed036fb1545ebc272d4f1b39641a3.tar.gz gcc-9f679370006ed036fb1545ebc272d4f1b39641a3.tar.bz2 | |
Do not instrument register variables in object-size sanitizer (PR sanitizer/70878).
2017-04-11 Martin Liska <mliska@suse.cz>
PR sanitizer/70878
* ubsan.c (instrument_object_size): Do not instrument register
variables.
2017-04-11 Martin Liska <mliska@suse.cz>
PR sanitizer/70878
* gcc.dg/ubsan/pr70878.c: New test.
From-SVN: r246837
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/ubsan/pr70878.c | 9 | ||||
| -rw-r--r-- | gcc/ubsan.c | 6 |
4 files changed, 25 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c56b450..71894ec 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-04-11 Martin Liska <mliska@suse.cz> + + PR sanitizer/70878 + * ubsan.c (instrument_object_size): Do not instrument register + variables. + 2017-04-11 Jakub Jelinek <jakub@redhat.com> PR target/80381 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ebfe739..116b5b2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-04-11 Martin Liska <mliska@suse.cz> + + PR sanitizer/70878 + * gcc.dg/ubsan/pr70878.c: New test. + 2017-04-11 Jakub Jelinek <jakub@redhat.com> PR target/80381 diff --git a/gcc/testsuite/gcc.dg/ubsan/pr70878.c b/gcc/testsuite/gcc.dg/ubsan/pr70878.c new file mode 100644 index 0000000..acd7fb0 --- /dev/null +++ b/gcc/testsuite/gcc.dg/ubsan/pr70878.c @@ -0,0 +1,9 @@ +/* PR sanitizer/80878 */ +/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */ +/* { dg-options "-fsanitize=object-size" } */ + +void * sbrk () +{ + volatile register unsigned int sp_r1 __asm__ ("ebx"); + return __builtin_strcat ((char*)sp_r1, 0); /* { dg-warning "cast to pointer from integer of different size" } */ +} diff --git a/gcc/ubsan.c b/gcc/ubsan.c index 323c1cc..c01d633 100644 --- a/gcc/ubsan.c +++ b/gcc/ubsan.c @@ -1806,7 +1806,11 @@ instrument_object_size (gimple_stmt_iterator *gsi, bool is_lhs) bool decl_p = DECL_P (inner); tree base; if (decl_p) - base = inner; + { + if (DECL_REGISTER (inner)) + return; + base = inner; + } else if (TREE_CODE (inner) == MEM_REF) base = TREE_OPERAND (inner, 0); else |