This is the mail archive of the libc-hacker@sourceware.org mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
| Other format: | [Raw text] | |
Hi!
s390/s390x hasn't been updated to handle alternate stacks properly.
The following untested patch should cure it.
2009-09-08 Jakub Jelinek <jakub@redhat.com>
* sysdeps/s390/s390-32/____longjmp_chk.c: Removed.
* sysdeps/s390/s390-64/____longjmp_chk.c: Removed.
* sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c: New file.
* sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c: New file.
--- libc/sysdeps/s390/s390-32/____longjmp_chk.c.jj 2009-05-29 21:50:43.000000000 +0200
+++ libc/sysdeps/s390/s390-32/____longjmp_chk.c 2009-09-08 13:52:10.000000000 +0200
@@ -1,41 +0 @@
-/* Copyright (C) 2009 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Jakub Jelinek <jakub@redhat.com>.
-
- 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 <errno.h>
-#include <sysdep.h>
-#include <setjmp.h>
-#include <bits/setjmp.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-
-#define __longjmp ____longjmp_chk
-
-#define CHECK_SP(env, guard) \
- do \
- { \
- uintptr_t cur_sp; \
- uintptr_t new_sp = env->__gregs[9]; \
- __asm ("lr %0, %%r15" : "=r" (cur_sp)); \
- new_sp ^= guard; \
- if (new_sp < cur_sp) \
- __fortify_fail ("longjmp causes uninitialized stack frame"); \
- } while (0)
-
-#include "__longjmp.c"
--- libc/sysdeps/s390/s390-64/____longjmp_chk.c.jj 2009-05-29 21:50:43.000000000 +0200
+++ libc/sysdeps/s390/s390-64/____longjmp_chk.c 2009-09-08 13:52:10.000000000 +0200
@@ -1,41 +0 @@
-/* Copyright (C) 2009 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Jakub Jelinek <jakub@redhat.com>.
-
- 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 <errno.h>
-#include <sysdep.h>
-#include <setjmp.h>
-#include <bits/setjmp.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-
-#define __longjmp ____longjmp_chk
-
-#define CHECK_SP(env, guard) \
- do \
- { \
- uintptr_t cur_sp; \
- uintptr_t new_sp = env->__gregs[9]; \
- __asm ("lgr %0, %%r15" : "=r" (cur_sp)); \
- new_sp ^= guard; \
- if (new_sp < cur_sp) \
- __fortify_fail ("longjmp causes uninitialized stack frame"); \
- } while (0)
-
-#include "__longjmp.c"
--- libc/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c.jj 2009-09-08 13:51:22.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c 2009-09-08 14:15:27.000000000 +0200
@@ -0,0 +1,55 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Jakub Jelinek <jakub@redhat.com>.
+
+ 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 <errno.h>
+#include <sysdep.h>
+#include <setjmp.h>
+#include <bits/setjmp.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <signal.h>
+#include <sys/syscall.h>
+
+#define __longjmp ____longjmp_chk
+
+#define CHECK_SP(env, guard) \
+ do \
+ { \
+ uintptr_t cur_sp; \
+ uintptr_t new_sp = env->__gregs[9]; \
+ __asm ("lr %0, %%r15" : "=r" (cur_sp)); \
+ new_sp ^= guard; \
+ if (new_sp < cur_sp) \
+ { \
+ stack_t oss; \
+ INTERNAL_SYSCALL_DECL (err); \
+ int res = INTERNAL_SYSCALL (sigaltstack, err, 2, NULL, &oss); \
+ if (!INTERNAL_SYSCALL_ERROR_P (res, err)) \
+ { \
+ if ((oss.ss_flags & SS_ONSTACK) == 0 \
+ || ((uintptr_t) (oss.ss_sp + oss.ss_size) - new_sp \
+ >= oss.ss_size)) \
+ __fortify_fail ("longjmp causes uninitialized stack frame");\
+ } \
+ } \
+ } while (0)
+
+#include "__longjmp.c"
--- libc/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c.jj 2009-09-08 13:51:22.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c 2009-09-08 14:15:14.000000000 +0200
@@ -0,0 +1,55 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Jakub Jelinek <jakub@redhat.com>.
+
+ 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 <errno.h>
+#include <sysdep.h>
+#include <setjmp.h>
+#include <bits/setjmp.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <signal.h>
+#include <sys/syscall.h>
+
+#define __longjmp ____longjmp_chk
+
+#define CHECK_SP(env, guard) \
+ do \
+ { \
+ uintptr_t cur_sp; \
+ uintptr_t new_sp = env->__gregs[9]; \
+ __asm ("lgr %0, %%r15" : "=r" (cur_sp)); \
+ new_sp ^= guard; \
+ if (new_sp < cur_sp) \
+ { \
+ stack_t oss; \
+ INTERNAL_SYSCALL_DECL (err); \
+ int res = INTERNAL_SYSCALL (sigaltstack, err, 2, NULL, &oss); \
+ if (!INTERNAL_SYSCALL_ERROR_P (res, err)) \
+ { \
+ if ((oss.ss_flags & SS_ONSTACK) == 0 \
+ || ((uintptr_t) (oss.ss_sp + oss.ss_size) - new_sp \
+ >= oss.ss_size)) \
+ __fortify_fail ("longjmp causes uninitialized stack frame");\
+ } \
+ } \
+ } while (0)
+
+#include "__longjmp.c"
Jakub
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |