Commit 99992ad2 authored by Matt Caswell's avatar Matt Caswell
Browse files

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: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7680)

(cherry picked from commit 71b1ceff)
parent 4bd0db1f

crypto/err/err.c

+4 −0
Original line number Diff line number Diff line
@@ -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

e_os.h

+3 −0
Original line number Diff line number Diff line
@@ -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