From: Joseph Myers Date: Thu, 6 Aug 2009 16:53:09 +0000 (+0000) Subject: Add alternate signal stack support to ARM ____longjmp_chk. X-Git-Tag: glibc-2.16-ports-before-merge~599 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53df8bcec0cc4a07dcb0d13f9105a9002d9183d8;p=thirdparty%2Fglibc.git Add alternate signal stack support to ARM ____longjmp_chk. * sysdeps/arm/____longjmp_chk.S: Remove. Replaced by.... * sysdeps/unix/sysv/linux/arm/____longjmp_chk.S, sysdeps/unix/sysv/linux/arm/eabi/____longjmp_chk.S: This. New files. * sysdeps/arm/__longjmp.S, sysdeps/arm/eabi/__longjmp.S: Use r4 for saved sp. --- diff --git a/ChangeLog.arm b/ChangeLog.arm index fe878096b84..9df8b0f4248 100644 --- a/ChangeLog.arm +++ b/ChangeLog.arm @@ -1,3 +1,12 @@ +2009-08-06 Joseph Myers + + * sysdeps/arm/____longjmp_chk.S: Remove. Replaced by.... + * sysdeps/unix/sysv/linux/arm/____longjmp_chk.S, + sysdeps/unix/sysv/linux/arm/eabi/____longjmp_chk.S: This. New + files. + * sysdeps/arm/__longjmp.S, sysdeps/arm/eabi/__longjmp.S: Use r4 + for saved sp. + 2009-07-29 Aurelien Jarno * sysdeps/unix/sysv/linux/arm/kernel-features.h: Define diff --git a/sysdeps/arm/__longjmp.S b/sysdeps/arm/__longjmp.S index c834e7860bd..09e63864176 100644 --- a/sysdeps/arm/__longjmp.S +++ b/sysdeps/arm/__longjmp.S @@ -30,8 +30,8 @@ ENTRY (__longjmp) moveq r0, #1 /* can't let setjmp() return zero! */ #ifdef CHECK_SP - ldr r1, [ip, #32] - CHECK_SP (r1) + ldr r4, [ip, #32] + CHECK_SP (r4) #endif LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc}) END (__longjmp) diff --git a/sysdeps/arm/eabi/__longjmp.S b/sysdeps/arm/eabi/__longjmp.S index 1f3f791569d..f283297089f 100644 --- a/sysdeps/arm/eabi/__longjmp.S +++ b/sysdeps/arm/eabi/__longjmp.S @@ -31,8 +31,8 @@ ENTRY (__longjmp) moveq r0, #1 /* can't let setjmp() return zero! */ #ifdef CHECK_SP - ldr r1, [ip, #32] - CHECK_SP (r1) + ldr r4, [ip, #32] + CHECK_SP (r4) #endif LOADREGS(ia, ip!, {v1-v6, sl, fp, sp, lr}) diff --git a/sysdeps/arm/____longjmp_chk.S b/sysdeps/unix/sysv/linux/arm/____longjmp_chk.S similarity index 79% rename from sysdeps/arm/____longjmp_chk.S rename to sysdeps/unix/sysv/linux/arm/____longjmp_chk.S index 16fc4cdebb9..2fa727dcfec 100644 --- a/sysdeps/arm/____longjmp_chk.S +++ b/sysdeps/unix/sysv/linux/arm/____longjmp_chk.S @@ -16,6 +16,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include .section .rodata.str1.1,"aMS",%progbits,1 .type longjmp_msg,%object @@ -47,9 +48,28 @@ longjmp_msg: #endif #define CHECK_SP(reg) \ - cmp sp, reg; \ + cmp sp, reg; \ bls .Lok; \ + mov r5, r0; \ + mov r0, #0; \ + sub sp, sp, #16; \ + mov r1, sp; \ + swi #SYS_ify(sigaltstack); \ + cmp r0, #0; \ + bne .Lok2; \ + ldr r1, [sp, #4]; \ + tst r1, #1; \ + beq .Lfail; \ + ldr r2, [sp, #0]; \ + ldr r3, [sp, #8]; \ + add r2, r2, r3; \ + sub r2, r2, reg; \ + cmp r2, r3; \ + bhi .Lok2; \ +.Lfail: \ CALL_FAIL \ +.Lok2: \ + mov r0, r5; \ .Lok: #include <__longjmp.S> diff --git a/sysdeps/unix/sysv/linux/arm/eabi/____longjmp_chk.S b/sysdeps/unix/sysv/linux/arm/eabi/____longjmp_chk.S new file mode 100644 index 00000000000..f92a382e441 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arm/eabi/____longjmp_chk.S @@ -0,0 +1,76 @@ +/* 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 General Public License + along with GCC; see the file COPYING. If not, write to the Free + Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ + +#include + + .section .rodata.str1.1,"aMS",%progbits,1 + .type longjmp_msg,%object +longjmp_msg: + .string "longjmp causes uninitialized stack frame" + .size longjmp_msg, .-longjmp_msg + .text + +#define __longjmp ____longjmp_chk + +#ifdef PIC +# define CALL_FAIL \ + ldr sl, .L_GOT; \ +.L_GOT_OFF: \ + add sl, pc, sl; \ + ldr r0, .Lstr; \ + add r0, sl, r0; \ + B PLTJMP(HIDDEN_JUMPTARGET(__fortify_fail)); \ +.L_GOT: \ + .word _GLOBAL_OFFSET_TABLE_-(.L_GOT_OFF+8); \ +.Lstr: \ + .word longjmp_msg(GOTOFF); +#else +# define CALL_FAIL \ + ldr r0, .Lstr; \ + B HIDDEN_JUMPTARGET(__fortify_fail); \ +.Lstr: \ + .word longjmp_msg; +#endif + +#define CHECK_SP(reg) \ + cmp sp, reg; \ + bls .Lok; \ + mov r5, r0; \ + mov r7, #SYS_ify(sigaltstack); \ + mov r0, #0; \ + sub sp, sp, #16; \ + mov r1, sp; \ + swi #0; \ + cmp r0, #0; \ + bne .Lok2; \ + ldr r1, [sp, #4]; \ + tst r1, #1; \ + beq .Lfail; \ + ldr r2, [sp, #0]; \ + ldr r3, [sp, #8]; \ + add r2, r2, r3; \ + sub r2, r2, reg; \ + cmp r2, r3; \ + bhi .Lok2; \ +.Lfail: \ + CALL_FAIL \ +.Lok2: \ + mov r0, r5; \ +.Lok: + +#include <__longjmp.S>