Commit 0f6fd614 authored by Patrick Steuer's avatar Patrick Steuer
Browse files

s390x assembly pack: fix restoring of SIGILL action 



Signed-off-by: default avatarPatrick Steuer <patrick.steuer@de.ibm.com>

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9381)

(cherry picked from commit c17d60ea293746d7cd06a910ced446edbb6c1eba)
parent 8d64f00f

crypto/s390xcap.c

+5 −5
Original line number Diff line number Diff line
@@ -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);

}