qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add ___longjmp_chk support for powerpc{32,64}.

This commit is contained in:
Andreas Schwab 2009-05-22 08:28:20 -07:00 committed by Ulrich Drepper
parent 1e1dc4e82d
commit 0323b051be
6 changed files with 116 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2009-05-22 Andreas Schwab <schwab@linux-m68k.org>
* sysdeps/powerpc/powerpc32/____longjmp_chk.S: New file.
* sysdeps/powerpc/powerpc64/____longjmp_chk.S: New file.
* sysdeps/powerpc/powerpc32/__longjmp-common.S: Use CHECK_SP if
defined.
* sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S: Likewise.
* sysdeps/powerpc/powerpc64/__longjmp-common.S: Likewise.
2009-05-22 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/accept4.c: Include kernel-features.h.

37
sysdeps/powerpc/powerpc32/____longjmp_chk.S Normal file
View File

@ -0,0 +1,37 @@
/* Copyright (C) 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <sysdep.h>
#include <rtld-global-offsets.h>
.section .rodata.str1.1,"aMS",@progbits,1
.LC0:
.string "longjmp causes uninitialized stack frame"
.text
#define __longjmp ____longjmp_chk
#define CHECK_SP(reg) \
cmplw reg, r1; \
bge+ .Lok; \
lis r3,.LC0@ha; \
la r3,.LC0@l(r3); \
bl HIDDEN_JUMPTARGET (__fortify_fail); \
.Lok:
#include <__longjmp-common.S>

12
sysdeps/powerpc/powerpc32/__longjmp-common.S
View File

@ -1,5 +1,5 @@
/* longjmp for PowerPC.
Copyright (C) 1995-1997, 1999-2001, 2003, 2004, 2005, 2006
Copyright (C) 1995-1997, 1999-2001, 2003, 2004, 2005, 2006, 2009
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@ -31,7 +31,7 @@
ENTRY (BP_SYM (__longjmp))
CHECK_BOUNDS_BOTH_WIDE_LIT (r3, r8, r9, JB_SIZE)
#ifdef PTR_DEMANGLE
#if defined PTR_DEMANGLE || defined CHECK_SP
lwz r24,(JB_GPR1*4)(r3)
#else
lwz r1,(JB_GPR1*4)(r3)
@ -45,8 +45,16 @@ ENTRY (BP_SYM (__longjmp))
lwz r19,((JB_GPRS+5)*4)(r3)
lwz r20,((JB_GPRS+6)*4)(r3)
#ifdef PTR_DEMANGLE
# ifdef CHECK_SP
PTR_DEMANGLE3 (r24, r24, r25)
# else
PTR_DEMANGLE3 (r1, r24, r25)
# endif
PTR_DEMANGLE2 (r0, r25)
#endif
#ifdef CHECK_SP
CHECK_SP (r24)
mr r1,r24
#endif
mtlr r0
lwz r21,((JB_GPRS+7)*4)(r3)

10
sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
View File

@ -114,7 +114,7 @@ L(aligned_restore_vmx):
lvx v31,0,r6
L(no_vmx):
#endif
#ifdef PTR_DEMANGLE
#if defined PTR_DEMANGLE || defined CHECK_SP
lwz r24,(JB_GPR1*4)(r3)
#else
lwz r1,(JB_GPR1*4)(r3)
@ -135,8 +135,16 @@ L(no_vmx):
lwz r20,((JB_GPRS+6)*4)(r3)
lfd fp20,((JB_FPRS+6*2)*4)(r3)
#ifdef PTR_DEMANGLE
# ifdef CHECK_SP
PTR_DEMANGLE3 (r24, r24, r25)
# else
PTR_DEMANGLE3 (r1, r24, r25)
# endif
PTR_DEMANGLE2 (r0, r25)
#endif
#ifdef CHECK_SP
CHECK_SP (r24)
mr r1,r24
#endif
mtlr r0
lwz r21,((JB_GPRS+7)*4)(r3)

39
sysdeps/powerpc/powerpc64/____longjmp_chk.S Normal file
View File

@ -0,0 +1,39 @@
/* Copyright (C) 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <sysdep.h>
#include <rtld-global-offsets.h>
.section .rodata.str1.1,"aMS",@progbits,1
.LC0:
.string "longjmp causes uninitialized stack frame"
.section .toc,"aw"
.LC1:
.tc .LC0[TC],.LC0
.text
#define __longjmp ____longjmp_chk
#define CHECK_SP(reg) \
cmpld reg, r1; \
bge+ .Lok; \
ld r3,.LC1@toc(2); \
bl HIDDEN_JUMPTARGET (__fortify_fail); \
.Lok:
#include <__longjmp-common.S>

14
sysdeps/powerpc/powerpc64/__longjmp-common.S
View File

@ -107,11 +107,21 @@ L(aligned_restore_vmx):
lvx v31,0,r6
L(no_vmx):
#endif
#ifdef PTR_DEMANGLE
#if defined PTR_DEMANGLE || defined CHECK_SP
ld r22,(JB_GPR1*8)(r3)
PTR_DEMANGLE3 (r1, r22, r25)
#else
ld r1,(JB_GPR1*8)(r3)
#endif
#ifdef PTR_DEMANGLE
# ifdef CHECK_SP
PTR_DEMANGLE3 (r22, r22, r25)
# else
PTR_DEMANGLE3 (r1, r22, r25)
# endif
#endif
#ifdef CHECK_SP
CHECK_SP (r22)
mr r1,r22
#endif
ld r2,(JB_GPR2*8)(r3)
ld r0,(JB_LR*8)(r3)