From a33919698b8b7e556f2eaf7d8550842ee654f2ae Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Netto Date: Wed, 19 Oct 2022 19:14:20 -0300 Subject: Linux: consolidate ____longjmp_chk Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/____longjmp_chk.c | 55 +++++++++++++++++++++++ sysdeps/unix/sysv/linux/generic/____longjmp_chk.c | 55 ----------------------- 2 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/____longjmp_chk.c delete mode 100644 sysdeps/unix/sysv/linux/generic/____longjmp_chk.c (limited to 'sysdeps') diff --git a/sysdeps/unix/sysv/linux/____longjmp_chk.c b/sysdeps/unix/sysv/linux/____longjmp_chk.c new file mode 100644 index 0000000000..687cb27133 --- /dev/null +++ b/sysdeps/unix/sysv/linux/____longjmp_chk.c @@ -0,0 +1,55 @@ +/* longjmp fortify implementation. Linux version. + Copyright (C) 2011-2022 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, see + . */ + +#include +#include +#include +#include +#include +#include + +#ifdef _STACK_GROWS_DOWN +#define called_from(this, saved) ((this) < (saved)) +#else +#define called_from(this, saved) ((this) > (saved)) +#endif + +_Noreturn extern void ____longjmp_chk (__jmp_buf __env, int __val); + +void ____longjmp_chk (__jmp_buf env, int val) +{ + void *this_frame = __builtin_frame_address (0); + void *saved_frame = JB_FRAME_ADDRESS (env); + stack_t ss; + + /* If "env" is from a frame that called us, we're all set. */ + if (called_from(this_frame, saved_frame)) + __longjmp (env, val); + + /* If we can't get the current stack state, give up and do the longjmp. */ + if (INTERNAL_SYSCALL_CALL (sigaltstack, NULL, &ss) != 0) + __longjmp (env, val); + + /* If we we are executing on the alternate stack and within the + bounds, do the longjmp. */ + if (ss.ss_flags == SS_ONSTACK + && (this_frame >= ss.ss_sp && this_frame < (ss.ss_sp + ss.ss_size))) + __longjmp (env, val); + + __fortify_fail ("longjmp causes uninitialized stack frame"); +} diff --git a/sysdeps/unix/sysv/linux/generic/____longjmp_chk.c b/sysdeps/unix/sysv/linux/generic/____longjmp_chk.c deleted file mode 100644 index aac1158853..0000000000 --- a/sysdeps/unix/sysv/linux/generic/____longjmp_chk.c +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright (C) 2011-2022 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, see - . */ - -#include -#include -#include -#include -#include -#include - -#ifdef _STACK_GROWS_DOWN -#define called_from(this, saved) ((this) < (saved)) -#else -#define called_from(this, saved) ((this) > (saved)) -#endif - -extern void ____longjmp_chk (__jmp_buf __env, int __val) - __attribute__ ((__noreturn__)); - -void ____longjmp_chk (__jmp_buf env, int val) -{ - void *this_frame = __builtin_frame_address (0); - void *saved_frame = JB_FRAME_ADDRESS (env); - stack_t ss; - - /* If "env" is from a frame that called us, we're all set. */ - if (called_from(this_frame, saved_frame)) - __longjmp (env, val); - - /* If we can't get the current stack state, give up and do the longjmp. */ - if (INTERNAL_SYSCALL_CALL (sigaltstack, NULL, &ss) != 0) - __longjmp (env, val); - - /* If we we are executing on the alternate stack and within the - bounds, do the longjmp. */ - if (ss.ss_flags == SS_ONSTACK - && (this_frame >= ss.ss_sp && this_frame < (ss.ss_sp + ss.ss_size))) - __longjmp (env, val); - - __fortify_fail ("longjmp causes uninitialized stack frame"); -} -- cgit 1.4.1