Commit e1dd8fa0 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix the check_fatal macro 



The check_fatal macro is supposed to only be called if we are already
expecting to be in the fatal state. The macro asserts that we are and
puts us into the fatal state if not.

This issue combined with the problem fixed in the previous commit meant
that the fuzzer detected a crash at a point in the processing when we
should have already been in the fatal state.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4847)
parent 2894e9cb

ssl/statem/statem.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ void ossl_statem_fatal(SSL *s, int al, int func, int reason, const char *file, 
#define check_fatal(s, f) \

    do { \

        if (!ossl_assert((s)->statem.in_init \

                         || (s)->statem.state != MSG_FLOW_ERROR)) \

                         && (s)->statem.state == MSG_FLOW_ERROR)) \

            SSLfatal(s, SSL_AD_INTERNAL_ERROR, (f), \

                     SSL_R_MISSING_FATAL); \

    } while (0)