diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2022-08-11 16:21:23 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2022-10-17 14:21:47 -0700 |
commit | 9072db9d5b549db5e2f14335ac0adc7735d43bc6 (patch) | |
tree | 0c48f84e70e2698f8109b43b7abb97639dc58928 /libgcc/unwind-generic.h | |
parent | 84807af0ca6dfdb81abb8e925ce32acbcab29868 (diff) | |
download | gcc-9072db9d5b549db5e2f14335ac0adc7735d43bc6.zip gcc-9072db9d5b549db5e2f14335ac0adc7735d43bc6.tar.gz gcc-9072db9d5b549db5e2f14335ac0adc7735d43bc6.tar.bz2 |
x86: Check corrupted return address when unwinding stack
If shadow stack is enabled, when unwinding stack, we count how many stack
frames we pop to reach the landing pad and adjust shadow stack by the same
amount. When counting the stack frame, we compare the return address on
normal stack against the return address on shadow stack. If they don't
match, return _URC_FATAL_PHASE2_ERROR for the corrupted return address on
normal stack. Don't check the return address for
1. Non-catchable exception where exception_class == 0. Process will be
terminated.
2. Zero return address which marks the outermost stack frame.
3. Signal stack frame since kernel puts a restore token on shadow stack.
* unwind-generic.h (_Unwind_Frames_Increment): Add the EXC
argument.
* unwind.inc (_Unwind_RaiseException_Phase2): Pass EXC to
_Unwind_Frames_Increment.
(_Unwind_ForcedUnwind_Phase2): Likewise.
* config/i386/shadow-stack-unwind.h (_Unwind_Frames_Increment):
Take the EXC argument. Return _URC_FATAL_PHASE2_ERROR if the
return address on normal stack doesn't match the return address
on shadow stack.
Diffstat (limited to 'libgcc/unwind-generic.h')
-rw-r--r-- | libgcc/unwind-generic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libgcc/unwind-generic.h b/libgcc/unwind-generic.h index a87c9b3..bf72128 100644 --- a/libgcc/unwind-generic.h +++ b/libgcc/unwind-generic.h @@ -292,6 +292,6 @@ EXCEPTION_DISPOSITION _GCC_specific_handler (PEXCEPTION_RECORD, void *, #define _Unwind_Frames_Extra(frames) /* Increment frame count. */ -#define _Unwind_Frames_Increment(context, frames) frames++ +#define _Unwind_Frames_Increment(exc, context, frames) frames++ #endif /* unwind.h */ |