aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2017-01-23 16:05:07 +0100
committerBjörn-Egil Dahlberg <[email protected]>2017-02-02 09:40:28 +0100
commit9ccb988eeb79815a33e0dd138278e0c29ed3ca6a (patch)
treed8f524e714d5f7e92fa251c898ff37d12e160ccd
parent314fddc2e2e4cd8587ce00dfce328245a315832f (diff)
downloadotp-9ccb988eeb79815a33e0dd138278e0c29ed3ca6a.tar.gz
otp-9ccb988eeb79815a33e0dd138278e0c29ed3ca6a.tar.bz2
otp-9ccb988eeb79815a33e0dd138278e0c29ed3ca6a.zip
erts: Do not handle SIGILL
* Remove SIGILL from signal whitelist
-rw-r--r--erts/emulator/sys/unix/sys.c8
-rw-r--r--erts/emulator/test/os_signal_SUITE.erl2
2 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index a25d865c91..cb20c690b4 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -699,7 +699,7 @@ static RETSIGTYPE suspend_signal(int signum)
SIGHUP Term Hangup detected on controlling terminal or death of controlling process
!SIGINT Term Interrupt from keyboard
SIGQUIT Core Quit from keyboard
- SIGILL Core Illegal Instruction
+ !SIGILL Core Illegal Instruction
SIGABRT Core Abort signal from abort(3)
!SIGFPE Core Floating point exception
!SIGKILL Term Kill signal
@@ -725,7 +725,7 @@ signalterm_to_signum(Eterm signal)
case am_sighup: return SIGHUP;
/* case am_sigint: return SIGINT; */
case am_sigquit: return SIGQUIT;
- case am_sigill: return SIGILL;
+ /* case am_sigill: return SIGILL; */
case am_sigabrt: return SIGABRT;
/* case am_sigsegv: return SIGSEGV; */
case am_sigalrm: return SIGALRM;
@@ -745,12 +745,12 @@ signum_to_signalterm(int signum)
switch (signum) {
case SIGHUP: return am_sighup;
/* case SIGINT: return am_sigint; */ /* ^c */
- case SIGILL: return am_sigill;
+ case SIGQUIT: return am_sigquit; /* ^\ */
+ /* case SIGILL: return am_sigill; */
case SIGABRT: return am_sigabrt;
/* case SIGSEGV: return am_sigsegv; */
case SIGALRM: return am_sigalrm;
case SIGTERM: return am_sigterm;
- case SIGQUIT: return am_sigquit; /* ^\ */
case SIGUSR1: return am_sigusr1;
case SIGUSR2: return am_sigusr2;
case SIGCHLD: return am_sigchld;
diff --git a/erts/emulator/test/os_signal_SUITE.erl b/erts/emulator/test/os_signal_SUITE.erl
index 2b9343663d..7c3950114f 100644
--- a/erts/emulator/test/os_signal_SUITE.erl
+++ b/erts/emulator/test/os_signal_SUITE.erl
@@ -86,7 +86,7 @@ end_per_suite(_Config) ->
set_unset(_Config) ->
Signals = [sighup, %sigint,
- sigquit, sigill,
+ sigquit, %sigill,
sigabrt,
sigalrm, sigterm,
sigusr1, sigusr2,