diff options
| author | Patrick Steuer <patrick.steuer@de.ibm.com> | 2019-07-15 17:00:15 +0200 |
|---|---|---|
| committer | Patrick Steuer <patrick.steuer@de.ibm.com> | 2019-07-17 20:15:38 +0200 |
| commit | 0f6fd6145924ad5fbddb96570877d36f1e077707 (patch) | |
| tree | a27ada4b455f3fe3cc333af65221fd3a6f2a42f6 | |
| parent | 8d64f00fd91f83e36017d7517c9e6d9fd98f6237 (diff) | |
s390x assembly pack: fix restoring of SIGILL action
Signed-off-by: Patrick Steuer <patrick.steuer@de.ibm.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9381)
(cherry picked from commit c17d60ea293746d7cd06a910ced446edbb6c1eba)
| -rw-r--r-- | crypto/s390xcap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/s390xcap.c b/crypto/s390xcap.c index e7c7f0a357..a40efe0e90 100644 --- a/crypto/s390xcap.c +++ b/crypto/s390xcap.c @@ -29,7 +29,7 @@ struct OPENSSL_s390xcap_st OPENSSL_s390xcap_P; void OPENSSL_cpuid_setup(void) { sigset_t oset; - struct sigaction ill_act, oact; + struct sigaction ill_act, oact_ill, oact_fpe; if (OPENSSL_s390xcap_P.stfle[0]) return; @@ -44,8 +44,8 @@ void OPENSSL_cpuid_setup(void) sigdelset(&ill_act.sa_mask, SIGFPE); sigdelset(&ill_act.sa_mask, SIGTRAP); sigprocmask(SIG_SETMASK, &ill_act.sa_mask, &oset); - sigaction(SIGILL, &ill_act, &oact); - sigaction(SIGFPE, &ill_act, &oact); + sigaction(SIGILL, &ill_act, &oact_ill); + sigaction(SIGFPE, &ill_act, &oact_fpe); /* protection against missing store-facility-list-extended */ if (sigsetjmp(ill_jmp, 1) == 0) @@ -61,7 +61,7 @@ void OPENSSL_cpuid_setup(void) | S390X_CAPBIT(S390X_VXE)); } - sigaction(SIGFPE, &oact, NULL); - sigaction(SIGILL, &oact, NULL); + sigaction(SIGFPE, &oact_fpe, NULL); + sigaction(SIGILL, &oact_ill, NULL); sigprocmask(SIG_SETMASK, &oset, NULL); } |