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

Signal stack support for MIPS ____longjmp_chk.

Browse Source 
* sysdeps/mips/____longjmp_chk.c: Remove.  Replaced by....
	* sysdeps/unix/sysv/linux/mips/____longjmp_chk.c: This.  New file.
	* sysdeps/mips/__longjmp.c (__longjmp): Use explicit register
	variable for env.  Use expansion of CHECK_SP macro for check.
	* sysdeps/mips/mips64/__longjmp.c (__Longjmp): Likewise.
This commit is contained in:
Joseph Myers 2009-08-05 21:02:50 +00:00
parent 9d84a81fe9
commit c67273d5b2
4 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog.mips
View File

@ -1,3 +1,11 @@
2009-08-05 Joseph Myers <joseph@codesourcery.com>
* sysdeps/mips/____longjmp_chk.c: Remove. Replaced by....
* sysdeps/unix/sysv/linux/mips/____longjmp_chk.c: This. New file.
* sysdeps/mips/__longjmp.c (__longjmp): Use explicit register
variable for env. Use expansion of CHECK_SP macro for check.
* sysdeps/mips/mips64/__longjmp.c (__Longjmp): Likewise.
2009-08-03 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/mips/mips32/accept4.c,

8
sysdeps/mips/__longjmp.c
View File

@ -25,19 +25,19 @@
#endif
void
__longjmp (env, val_arg)
__jmp_buf env;
__longjmp (env_arg, val_arg)
__jmp_buf env_arg;
int val_arg;
{
/* gcc 1.39.19 miscompiled the longjmp routine (as it did setjmp before
the hack around it); force it to use $a1 for the longjmp value.
Without this it saves $a1 in a register which gets clobbered
along the way. */
register struct __jmp_buf_internal_tag *env asm ("a0");
register int val asm ("a1");
#ifdef CHECK_SP
register long sp asm ("$29");
if ((long) (env[0].__sp) < sp)
__fortify_fail ("longjmp causes uninitialized stack frame");
CHECK_SP (env[0].__sp, sp, long);
#endif
#ifdef __mips_hard_float

8
sysdeps/mips/mips64/__longjmp.c
View File

@ -27,19 +27,19 @@
#endif
void
__longjmp (env, val_arg)
__jmp_buf env;
__longjmp (env_arg, val_arg)
__jmp_buf env_arg;
int val_arg;
{
/* gcc 1.39.19 miscompiled the longjmp routine (as it did setjmp before
the hack around it); force it to use $a1 for the longjmp value.
Without this it saves $a1 in a register which gets clobbered
along the way. */
register struct __jmp_buf_internal_tag *env asm ("a0");
register int val asm ("a1");
#ifdef CHECK_SP
register long long sp asm ("$29");
if ((long long) (env[0].__sp) < sp)
__fortify_fail ("longjmp causes uninitialized stack frame");
CHECK_SP (env[0].__sp, sp, long long);
#endif
#ifdef __mips_hard_float

22
sysdeps/mips/____longjmp_chk.c → sysdeps/unix/sysv/linux/mips/____longjmp_chk.c
View File

@ -16,7 +16,27 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <signal.h>
#include <stdio.h>
#define __longjmp ____longjmp_chk
#define CHECK_SP
#define CHECK_SP(saved_sp, cur_sp, sp_type) \
do { \
sp_type sp_saved = (sp_type) (saved_sp); \
if (sp_saved < (cur_sp)) \
{ \
struct __jmp_buf_internal_tag *env_save = env_arg; \
int val_save = val_arg; \
stack_t ss; \
int ret = __sigaltstack (NULL, &ss); \
if (ret == 0 \
&& (!(ss.ss_flags & SS_ONSTACK) \
|| ((unsigned sp_type) ((sp_type) ss.ss_sp \
+ (sp_type) ss.ss_size \
- sp_saved) \
< ss.ss_size))) \
__fortify_fail ("longjmp causes uninitialized stack frame"); \
asm volatile ("move %0, %1" : "=r" (env) : "r" (env_save)); \
asm volatile ("move %0, %1" : "=r" (val) : "r" (val_save)); \
} \
} while (0)
#include <__longjmp.c>