|
 |
21f7f4 |
From f97e07ea807cc6d38774a3888a15091b20645ac6 Mon Sep 17 00:00:00 2001
|
|
|
21f7f4 |
From: Paul Eggert <eggert@cs.ucla.edu>
|
|
|
21f7f4 |
Date: Tue, 9 Mar 2021 11:22:59 -0800
|
|
|
21f7f4 |
Subject: [PATCH] Port alternate signal stack to upcoming glibc 2.34
|
|
|
21f7f4 |
MIME-Version: 1.0
|
|
|
21f7f4 |
Content-Type: text/plain; charset=UTF-8
|
|
|
21f7f4 |
Content-Transfer-Encoding: 8bit
|
|
|
21f7f4 |
|
|
|
21f7f4 |
* src/sysdep.c (sigsegv_stack): Increase size to 64 KiB and align
|
|
|
21f7f4 |
it to max_align_t. This copies from Gnulib’s c-stack.c, and works
|
|
|
21f7f4 |
around a portability bug in draft glibc 2.34, which no longer
|
|
|
21f7f4 |
defines SIGSTKSZ when _GNU_SOURCE is defined.
|
|
|
21f7f4 |
---
|
|
|
21f7f4 |
src/sysdep.c | 10 +++++++++-
|
|
|
21f7f4 |
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
21f7f4 |
|
|
|
21f7f4 |
diff --git a/src/sysdep.c b/src/sysdep.c
|
|
|
21f7f4 |
index 941b4e2fa2..24d8832b2f 100644
|
|
|
21f7f4 |
--- a/src/sysdep.c
|
|
|
21f7f4 |
+++ b/src/sysdep.c
|
|
|
21f7f4 |
@@ -1785,7 +1785,15 @@ handle_arith_signal (int sig)
|
|
|
21f7f4 |
|
|
|
21f7f4 |
/* Alternate stack used by SIGSEGV handler below. */
|
|
|
21f7f4 |
|
|
|
21f7f4 |
-static unsigned char sigsegv_stack[SIGSTKSZ];
|
|
|
21f7f4 |
+/* Storage for the alternate signal stack.
|
|
|
21f7f4 |
+ 64 KiB is not too large for Emacs, and is large enough
|
|
|
21f7f4 |
+ for all known platforms. Smaller sizes may run into trouble.
|
|
|
21f7f4 |
+ For example, libsigsegv 2.6 through 2.8 have a bug where some
|
|
|
21f7f4 |
+ architectures use more than the Linux default of an 8 KiB alternate
|
|
|
21f7f4 |
+ stack when deciding if a fault was caused by stack overflow. */
|
|
|
21f7f4 |
+static max_align_t sigsegv_stack[(64 * 1024
|
|
|
21f7f4 |
+ + sizeof (max_align_t) - 1)
|
|
|
21f7f4 |
+ / sizeof (max_align_t)];
|
|
|
21f7f4 |
|
|
|
21f7f4 |
|
|
|
21f7f4 |
/* Return true if SIGINFO indicates a stack overflow. */
|
|
|
21f7f4 |
--
|
|
|
21f7f4 |
2.29.2
|
|
|
21f7f4 |
|