public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r8-10307] Add missing store in emission of asan_stack_free.
@ 2020-06-12 8:30 Martin Liska
0 siblings, 0 replies; only message in thread
From: Martin Liska @ 2020-06-12 8:30 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:5d746191e271949e530d9e5f46cde7e7bf08272f
commit r8-10307-g5d746191e271949e530d9e5f46cde7e7bf08272f
Author: Martin Liska <mliska@suse.cz>
Date: Tue May 19 16:57:56 2020 +0200
Add missing store in emission of asan_stack_free.
gcc/ChangeLog:
2020-05-19 Martin Liska <mliska@suse.cz>
PR sanitizer/94910
* asan.c (asan_emit_stack_protection): Emit
also **SavedFlagPtr(FakeStack, class_id) = 0 in order to release
a stack frame.
(cherry picked from commit 8b6731e674c76cb48a417f2eef74ced92a17f469)
Diff:
---
gcc/asan.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/gcc/asan.c b/gcc/asan.c
index 235e219479d..4c99e3d9912 100644
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -1465,8 +1465,24 @@ asan_emit_stack_protection (rtx base, rtx pbase, unsigned int alignb,
if (use_after_return_class < 5
&& can_store_by_pieces (sz, builtin_memset_read_str, &c,
BITS_PER_UNIT, true))
- store_by_pieces (shadow_mem, sz, builtin_memset_read_str, &c,
- BITS_PER_UNIT, true, 0);
+ {
+ /* Emit:
+ memset(ShadowBase, kAsanStackAfterReturnMagic, ShadowSize);
+ **SavedFlagPtr(FakeStack, class_id) = 0
+ */
+ store_by_pieces (shadow_mem, sz, builtin_memset_read_str, &c,
+ BITS_PER_UNIT, true, 0);
+
+ unsigned HOST_WIDE_INT offset
+ = (1 << (use_after_return_class + 6));
+ offset -= GET_MODE_SIZE (ptr_mode);
+ mem = gen_rtx_MEM (ptr_mode, base);
+ mem = adjust_address (mem, ptr_mode, offset);
+ rtx addr = gen_reg_rtx (ptr_mode);
+ emit_move_insn (addr, mem);
+ mem = gen_rtx_MEM (QImode, addr);
+ emit_move_insn (mem, const0_rtx);
+ }
else if (use_after_return_class >= 5
|| !set_storage_via_setmem (shadow_mem,
GEN_INT (sz),
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-06-12 8:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-12 8:30 [gcc r8-10307] Add missing store in emission of asan_stack_free Martin Liska
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).