From e1dd8fa00a1e06d27c8b024dac7657a8d8a9b451 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 5 Dec 2017 13:37:26 +0000 Subject: [PATCH] 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: Rich Salz (Merged from https://github.com/openssl/openssl/pull/4847) --- ssl/statem/statem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c index 0cacc4acb7..29660d59c4 100644 --- a/ssl/statem/statem.c +++ b/ssl/statem/statem.c @@ -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) -- 2.25.1