me
/
guix
Archived
1
0
Fork 0
Code

gnu: camlboot: Fix signal handling with newer glibc. 

* gnu/packages/patches/camlboot-dynamically-allocate-stack-signal.patch:
  New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/ocaml.scm (camlboot): Use it.
master
Julien Lepiller 2023-02-19 22:54:10 +01:00
parent 4d6607a363
commit b1a0b5a3f5
No known key found for this signature in database
GPG Key ID: 53D457B2D636EE82
3 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@ -958,6 +958,7 @@ dist_patch_DATA = \
%D%/packages/patches/calibre-no-updates-dialog.patch \
%D%/packages/patches/calibre-remove-test-sqlite.patch \
%D%/packages/patches/calibre-remove-test-unrar.patch \
%D%/packages/patches/camlboot-dynamically-allocate-stack-signal.patch \
%D%/packages/patches/catdoc-CVE-2017-11110.patch \
%D%/packages/patches/chez-scheme-bin-sh.patch \
%D%/packages/patches/circos-remove-findbin.patch \

2
gnu/packages/ocaml.scm
View File

@ -133,6 +133,8 @@
(sha256
(base32
"1f5gl3hzvixbgk0v3kmxiyn432znyy3jh5fa65cfzcaxzgfv1i1c"))
(patches (search-patches
"camlboot-dynamically-allocate-stack-signal.patch"))
(modules '((guix build utils)))
(snippet
`(begin

52
gnu/packages/patches/camlboot-dynamically-allocate-stack-signal.patch 100644
View File

@ -0,0 +1,52 @@
From 883d68803d17d6f64cdabf2c8ef846345e2d0094 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Sun, 19 Feb 2023 10:20:19 +0100
Subject: [PATCH] Dynamically allocate the alternate signal stack.
This patch is a backport of https://github.com/ocaml/ocaml/pull/10266.
---
ocaml-src/asmrun/signals_asm.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/ocaml-src/asmrun/signals_asm.c b/ocaml-src/asmrun/signals_asm.c
index 3895d75..d37b481 100644
--- a/ocaml-src/asmrun/signals_asm.c
+++ b/ocaml-src/asmrun/signals_asm.c
@@ -182,7 +182,6 @@ DECLARE_SIGNAL_HANDLER(trap_handler)
#ifdef HAS_STACK_OVERFLOW_DETECTION
static char * system_stack_top;
-static char sig_alt_stack[SIGSTKSZ];
#if defined(SYS_linux)
/* PR#4746: recent Linux kernels with support for stack randomization
@@ -274,15 +273,19 @@ void caml_init_signals(void)
#ifdef HAS_STACK_OVERFLOW_DETECTION
{
stack_t stk;
- struct sigaction act;
- stk.ss_sp = sig_alt_stack;
+ stk.ss_sp = malloc(SIGSTKSZ);
stk.ss_size = SIGSTKSZ;
stk.ss_flags = 0;
- SET_SIGACT(act, segv_handler);
- act.sa_flags |= SA_ONSTACK | SA_NODEFER;
- sigemptyset(&act.sa_mask);
- system_stack_top = (char *) &act;
- if (sigaltstack(&stk, NULL) == 0) { sigaction(SIGSEGV, &act, NULL); }
+ if (stk.ss_sp != NULL) {
+ if (sigaltstack(&stk, NULL) != -1) {
+ struct sigaction act;
+ SET_SIGACT(act, segv_handler);
+ act.sa_flags |= SA_ONSTACK | SA_NODEFER;
+ sigemptyset(&act.sa_mask);
+ system_stack_top = (char *) &act;
+ sigaction(SIGSEGV, &act, NULL);
+ }
+ }
}
#endif
}
--
2.38.1