[v3,06/37] x86: Restore compile-time check for shadow stack pointer in longjmp

Message ID dd4f04cc6e67087e5e35dc6117a22030309e6ad4.1615914631.git.fweimer@redhat.com
State Superseded
Headers show
Series
  • Untitled series #110849
Related show

Commit Message

Florian Weimer via Libc-alpha March 16, 2021, 5:28 p.m.
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>


---
 sysdeps/unix/sysv/linux/x86/longjmp.c | 39 +++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 sysdeps/unix/sysv/linux/x86/longjmp.c

-- 
2.29.2

Patch

diff --git a/sysdeps/unix/sysv/linux/x86/longjmp.c b/sysdeps/unix/sysv/linux/x86/longjmp.c
new file mode 100644
index 0000000000..1cc8b8dfad
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/x86/longjmp.c
@@ -0,0 +1,39 @@ 
+/* __libc_siglongjmp for Linux/x86
+   Copyright (C) 2018-2021 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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <sysdeps/x86/longjmp.c>
+
+#include <nptl/pthreadP.h>
+#include <jmp_buf-ssp.h>
+
+#ifdef __x86_64__
+# define SHADOW_STACK_POINTER_SIZE 8
+#else
+# define SHADOW_STACK_POINTER_SIZE 4
+#endif
+
+/* Assert that the priv field in struct pthread_unwind_buf has space
+   to store shadow stack pointer.  */
+_Static_assert ((offsetof (struct pthread_unwind_buf, priv)
+                <= SHADOW_STACK_POINTER_OFFSET)
+               && ((offsetof (struct pthread_unwind_buf, priv)
+                    + sizeof (((struct pthread_unwind_buf *) 0)->priv))
+                   >= (SHADOW_STACK_POINTER_OFFSET
+                       + SHADOW_STACK_POINTER_SIZE)),
+               "Shadow stack pointer is not within private storage "
+               "of pthread_unwind_buf.");