AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-29 00:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86_64: Undef SHADOW_STACK_POINTER_OFFSET last

Browse Source 
Since SHADOW_STACK_POINTER_OFFSET is defined in jmp_buf-ssp.h, we must
undef SHADOW_STACK_POINTER_OFFSET after including <jmp_buf-ssp.h>.

	* sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S: Undef
	SHADOW_STACK_POINTER_OFFSET after including <jmp_buf-ssp.h>.
This commit is contained in:
H.J. Lu 2018-07-15 08:48:40 -07:00
parent faaee1f07e
commit 31e422ca96
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2018-07-15 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S: Undef
SHADOW_STACK_POINTER_OFFSET after including <jmp_buf-ssp.h>.
2018-07-14 Igor Tsimbalist <igor.v.tsimbalist@intel.com> 2018-07-14 Igor Tsimbalist <igor.v.tsimbalist@intel.com>
H.J. Lu <hongjiu.lu@intel.com> H.J. Lu <hongjiu.lu@intel.com>

5
sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
View File

@ -19,15 +19,14 @@
#include <jmpbuf-offsets.h> #include <jmpbuf-offsets.h>
#include <asm-syntax.h> #include <asm-syntax.h>
#include <stap-probe.h> #include <stap-probe.h>
#include <sigaltstack-offsets.h>
#include <jmp_buf-ssp.h>
/* Don't restore shadow stack register if shadow stack isn't enabled. */ /* Don't restore shadow stack register if shadow stack isn't enabled. */
#if !SHSTK_ENABLED #if !SHSTK_ENABLED
# undef SHADOW_STACK_POINTER_OFFSET # undef SHADOW_STACK_POINTER_OFFSET
#endif #endif
#include <sigaltstack-offsets.h>
#include <jmp_buf-ssp.h>
.section .rodata.str1.1,"aMS",@progbits,1 .section .rodata.str1.1,"aMS",@progbits,1
.type longjmp_msg,@object .type longjmp_msg,@object
longjmp_msg: longjmp_msg: