41352d50db
Build fails as:
$ make
CXX src/libmain/stack.o
src/libmain/stack.cc: In function 'void nix::sigsegvHandler(int, siginfo_t*, void*)':
src/libmain/stack.cc:21:21: error: 'ucontext' was not declared in this scope
sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_RSP];
^~~~~~~~
src/libmain/stack.cc:21:21: note: suggested alternative: 'ucontext_t'
sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_RSP];
^~~~~~~~
ucontext_t
It's caused by upstream rename:
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=251287734e89a52da3db682a8241eb6bccc050c9
which basically changes
typedef struct ucontext {} ucontext_t;
to
typedef struct ucontext_t {} ucontext_t;
The change uses ucontext_t.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
(cherry picked from commit c9857ef262)
73 lines
2 KiB
C++
73 lines
2 KiB
C++
#include "config.h"
|
|
|
|
#include "types.hh"
|
|
|
|
#include <cstring>
|
|
#include <cstddef>
|
|
#include <cstdlib>
|
|
|
|
#include <unistd.h>
|
|
#include <signal.h>
|
|
|
|
namespace nix {
|
|
|
|
|
|
static void sigsegvHandler(int signo, siginfo_t * info, void * ctx)
|
|
{
|
|
/* Detect stack overflows by comparing the faulting address with
|
|
the stack pointer. Unfortunately, getting the stack pointer is
|
|
not portable. */
|
|
bool haveSP = true;
|
|
char * sp = 0;
|
|
#if defined(__x86_64__) && defined(REG_RSP)
|
|
sp = (char *) ((ucontext_t *) ctx)->uc_mcontext.gregs[REG_RSP];
|
|
#elif defined(REG_ESP)
|
|
sp = (char *) ((ucontext_t *) ctx)->uc_mcontext.gregs[REG_ESP];
|
|
#else
|
|
haveSP = false;
|
|
#endif
|
|
|
|
if (haveSP) {
|
|
ptrdiff_t diff = (char *) info->si_addr - sp;
|
|
if (diff < 0) diff = -diff;
|
|
if (diff < 4096) {
|
|
char msg[] = "error: stack overflow (possible infinite recursion)\n";
|
|
(void) write(2, msg, strlen(msg));
|
|
_exit(1); // maybe abort instead?
|
|
}
|
|
}
|
|
|
|
/* Restore default behaviour (i.e. segfault and dump core). */
|
|
struct sigaction act;
|
|
sigfillset(&act.sa_mask);
|
|
act.sa_handler = SIG_DFL;
|
|
act.sa_flags = 0;
|
|
if (sigaction(SIGSEGV, &act, 0)) abort();
|
|
}
|
|
|
|
|
|
void detectStackOverflow()
|
|
{
|
|
#if defined(SA_SIGINFO) && defined (SA_ONSTACK)
|
|
/* Install a SIGSEGV handler to detect stack overflows. This
|
|
requires an alternative stack, otherwise the signal cannot be
|
|
delivered when we're out of stack space. */
|
|
stack_t stack;
|
|
stack.ss_size = 4096 * 4 + MINSIGSTKSZ;
|
|
stack.ss_sp = new char[stack.ss_size];
|
|
if (!stack.ss_sp) throw Error("cannot allocate alternative stack");
|
|
stack.ss_flags = 0;
|
|
if (sigaltstack(&stack, 0) == -1) throw SysError("cannot set alternative stack");
|
|
|
|
struct sigaction act;
|
|
sigfillset(&act.sa_mask);
|
|
act.sa_sigaction = sigsegvHandler;
|
|
act.sa_flags = SA_SIGINFO | SA_ONSTACK;
|
|
if (sigaction(SIGSEGV, &act, 0))
|
|
throw SysError("resetting SIGCHLD");
|
|
#endif
|
|
}
|
|
|
|
|
|
}
|