From f0e694490652893bd0957f8ded779133d883ebcd Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 6 Sep 2009 21:20:26 +0200 Subject: [PATCH] Add ____longjmp_chk for m68k-linux --- ChangeLog.m68k | 6 ++++ sysdeps/m68k/__longjmp.c | 7 ++++- sysdeps/unix/sysv/linux/m68k/____longjmp_chk.c | 39 ++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 sysdeps/unix/sysv/linux/m68k/____longjmp_chk.c diff --git a/ChangeLog.m68k b/ChangeLog.m68k index 3afc3da05d..41ede0155f 100644 --- a/ChangeLog.m68k +++ b/ChangeLog.m68k @@ -1,3 +1,9 @@ +2009-09-06 Andreas Schwab + + * sysdeps/unix/sysv/linux/m68k/____longjmp_chk.c: New file. + + * sysdeps/m68k/__longjmp.c (__longjmp): Call CHECK_SP if defined. + 2009-05-16 Joseph Myers * sysdeps/unix/sysv/linux/m68k/Versions (libc): Add diff --git a/sysdeps/m68k/__longjmp.c b/sysdeps/m68k/__longjmp.c index 7d876a7a14..5ba2478c0c 100644 --- a/sysdeps/m68k/__longjmp.c +++ b/sysdeps/m68k/__longjmp.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991, 92, 93, 94, 95, 97 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1997, 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 @@ -27,6 +28,10 @@ __longjmp (__jmp_buf env, int val) /* This restores the FP and SP that setjmp's caller had, and puts the return address into A0 and VAL into D0. */ +#ifdef CHECK_SP + CHECK_SP (env[0].__sp); +#endif + #if defined(__HAVE_68881__) || defined(__HAVE_FPU__) /* Restore the floating-point registers. */ asm volatile("fmovem%.x %0, %/fp0-%/fp7" : diff --git a/sysdeps/unix/sysv/linux/m68k/____longjmp_chk.c b/sysdeps/unix/sysv/linux/m68k/____longjmp_chk.c new file mode 100644 index 0000000000..8eaf59195b --- /dev/null +++ b/sysdeps/unix/sysv/linux/m68k/____longjmp_chk.c @@ -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 +#include +#include +#define __longjmp ____longjmp_chk +#define CHECK_SP(sp) \ + do { \ + register unsigned long this_sp asm ("sp"); \ + if ((unsigned long) (sp) < this_sp) \ + { \ + struct sigaltstack oss; \ + INTERNAL_SYSCALL_DECL (err); \ + int result = INTERNAL_SYSCALL (sigaltstack, err, 2, NULL, &oss); \ + if (!INTERNAL_SYSCALL_ERROR_P (result, err) \ + && ((oss.ss_flags & SS_ONSTACK) == 0 \ + || ((unsigned long) oss.ss_sp + oss.ss_size \ + - (unsigned long) (sp)) < oss.ss_size)) \ + __fortify_fail ("longjmp causes uninitialized stack frame"); \ + } \ + } while (0) + +#include <__longjmp.c> -- 2.11.4.GIT