This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
Community source repository for glibc add-on ports branch, master, updated. glibc-2.10.1-21-gc67273d
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 5 Aug 2009 21:03:29 -0000
- Subject: Community source repository for glibc add-on ports branch, master, updated. glibc-2.10.1-21-gc67273d
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Community source repository for glibc add-on ports".
The branch, master has been updated
via c67273d5b28317c87d2e9ee636ead6d71635e0e5 (commit)
from 9d84a81fe97400d669b5056ddcab9c59458d63e7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc-ports.git;a=commitdiff;h=c67273d5b28317c87d2e9ee636ead6d71635e0e5
commit c67273d5b28317c87d2e9ee636ead6d71635e0e5
Author: Joseph Myers <joseph@codesourcery.com>
Date: Wed Aug 5 21:02:50 2009 +0000
Signal stack support for MIPS ____longjmp_chk.
* 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.
diff --git a/ChangeLog.mips b/ChangeLog.mips
index 9afd961..5ba4297 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -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,
diff --git a/sysdeps/mips/____longjmp_chk.c b/sysdeps/mips/____longjmp_chk.c
deleted file mode 100644
index a46ed15..0000000
--- a/sysdeps/mips/____longjmp_chk.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* 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 <stdio.h>
-#define __longjmp ____longjmp_chk
-#define CHECK_SP
-#include <__longjmp.c>
diff --git a/sysdeps/mips/__longjmp.c b/sysdeps/mips/__longjmp.c
index 340485d..2a91771 100644
--- a/sysdeps/mips/__longjmp.c
+++ b/sysdeps/mips/__longjmp.c
@@ -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
diff --git a/sysdeps/mips/mips64/__longjmp.c b/sysdeps/mips/mips64/__longjmp.c
index d7e36ff..99aac01 100644
--- a/sysdeps/mips/mips64/__longjmp.c
+++ b/sysdeps/mips/mips64/__longjmp.c
@@ -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
diff --git a/sysdeps/unix/sysv/linux/mips/____longjmp_chk.c b/sysdeps/unix/sysv/linux/mips/____longjmp_chk.c
new file mode 100644
index 0000000..9db339c
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/____longjmp_chk.c
@@ -0,0 +1,42 @@
+/* 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 <signal.h>
+#include <stdio.h>
+#define __longjmp ____longjmp_chk
+#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>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog.mips | 8 ++++
sysdeps/mips/____longjmp_chk.c | 22 ------------
sysdeps/mips/__longjmp.c | 8 ++--
sysdeps/mips/mips64/__longjmp.c | 8 ++--
sysdeps/unix/sysv/linux/mips/____longjmp_chk.c | 42 ++++++++++++++++++++++++
5 files changed, 58 insertions(+), 30 deletions(-)
delete mode 100644 sysdeps/mips/____longjmp_chk.c
create mode 100644 sysdeps/unix/sysv/linux/mips/____longjmp_chk.c
hooks/post-receive
--
Community source repository for glibc add-on ports