From 99992ad22019e752c7b103a45f860a48b6bc0972 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 21 Nov 2018 11:44:42 +0000 Subject: [PATCH] Make sure build_SYS_str_reasons() preserves errno This function can end up being called during ERR_get_error() if we are initialising. ERR_get_error() must preserve errno since it gets called via SSL_get_error(). If that function returns SSL_ERROR_SYSCALL then you are supposed to inspect errno. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/7680) (cherry picked from commit 71b1ceffc4c795f5db21861dd1016fbe23a53a53) --- crypto/err/err.c | 4 ++++ e_os.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/crypto/err/err.c b/crypto/err/err.c index 1ad18b1924..5cfb02d821 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -21,6 +21,7 @@ #include "internal/thread_once.h" #include "internal/ctype.h" #include "internal/constant_time_locl.h" +#include "e_os.h" static int err_load_strings(const ERR_STRING_DATA *str); @@ -206,6 +207,7 @@ static void build_SYS_str_reasons(void) size_t cnt = 0; static int init = 1; int i; + int saveerrno = get_last_sys_error(); CRYPTO_THREAD_write_lock(err_string_lock); if (!init) { @@ -251,6 +253,8 @@ static void build_SYS_str_reasons(void) init = 0; CRYPTO_THREAD_unlock(err_string_lock); + /* openssl_strerror_r could change errno, but we want to preserve it */ + set_sys_error(saveerrno); err_load_strings(SYS_str_reasons); } #endif diff --git a/e_os.h b/e_os.h index 534059382b..8e6efa9616 100644 --- a/e_os.h +++ b/e_os.h @@ -49,6 +49,7 @@ # define get_last_sys_error() errno # define clear_sys_error() errno=0 +# define set_sys_error(e) errno=(e) /******************************************************************** The Microsoft section @@ -66,8 +67,10 @@ # ifdef WIN32 # undef get_last_sys_error # undef clear_sys_error +# undef set_sys_error # define get_last_sys_error() GetLastError() # define clear_sys_error() SetLastError(0) +# define set_sys_error(e) SetLastError(e) # if !defined(WINNT) # define WIN_CONSOLE_BUG # endif -- 2.25.1