Commit 6e8ac508 authored by Viktor Dukhovni's avatar Viktor Dukhovni
Browse files

Async error handling and MacOS/X fixes 



In the async code for MacOS/X define _XOPEN_SOURCE (if not already
defined) as early as possible.  We must do this before including
any header files, because on MacOS/X <stlib.h> includes <signal.h>
which includes <ucontext.h>.  If we delay defining _XOPEN_SOURCE
and include <ucontext.h> after various system headers are included,
we are very likely to end up with the wrong (truncated) definition
of ucontext_t.

Also, better error handling and some code cleanup in POSIX fibre
construction and destruction.  We make sure that async_fibre_makecontext()
always initializes the fibre to a state that can be freed.

For all implementations, check for error returns from
async_fibre_makecontext().

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 3d322188

crypto/async/arch/async_null.c

+1 −1
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ 
 * ====================================================================

 */



/* This must be the first #include file */

#include "../async_locl.h"

#include <openssl/async.h>



#ifdef ASYNC_NULL

crypto/async/arch/async_posix.c

+17 −19
Original line number Diff line number Diff line
@@ -51,15 +51,13 @@ 
 * ====================================================================

 */



/* This must be the first #include file */

#include "../async_locl.h"

#include <openssl/async.h>



#ifdef ASYNC_POSIX



# include <stddef.h>

# include <ucontext.h>

# include <unistd.h>

# include <openssl/crypto.h>

# include <openssl/async.h>



pthread_key_t posixctx;

pthread_key_t posixpool;
@@ -91,27 +89,27 @@ void async_global_cleanup(void) 
{

}



int async_fibre_init(async_fibre *fibre)

int async_fibre_makecontext(async_fibre *fibre)

{

    void *stack = NULL;



    stack = OPENSSL_malloc(STACKSIZE);

    if (stack == NULL) {

        return 0;

    }



    fibre->fibre.uc_stack.ss_sp = stack;

    fibre->env_init = 0;

    if (getcontext(&fibre->fibre) == 0) {

        fibre->fibre.uc_stack.ss_sp = OPENSSL_malloc(STACKSIZE);

        if (fibre->fibre.uc_stack.ss_sp != NULL) {

            fibre->fibre.uc_stack.ss_size = STACKSIZE;

            fibre->fibre.uc_link = NULL;

    fibre->env_init = 0;



            makecontext(&fibre->fibre, async_start_func, 0);

            return 1;

        }

    } else {

        fibre->fibre.uc_stack.ss_sp = NULL;

    }

    return 0;

}



void async_fibre_free(async_fibre *fibre)

{

    if (fibre->fibre.uc_stack.ss_sp)

    OPENSSL_free(fibre->fibre.uc_stack.ss_sp);

    fibre->fibre.uc_stack.ss_sp = NULL;

}



int async_pipe(OSSL_ASYNC_FD *pipefds)

crypto/async/arch/async_posix.h

+4 −13
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ 
 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * ====================================================================

 */

#ifndef OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H

#define OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H

#include <openssl/e_os2.h>



#if defined(OPENSSL_SYS_UNIX) && defined(OPENSSL_THREADS)
@@ -63,14 +65,6 @@ 
#  define ASYNC_POSIX

#  define ASYNC_ARCH



/*

 * Some platforms complain (e.g. OS-X) that setcontext/getcontext/makecontext

 * are deprecated without the following defined. We know its deprecated but

 * there is no alternative.

 */

#  define _XOPEN_SOURCE

#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"



#  include <ucontext.h>

#  include <setjmp.h>

#  include "e_os.h"
@@ -103,14 +97,11 @@ static inline int async_fibre_swapcontext(async_fibre *o, async_fibre *n, int r) 
    return 1;

}



#  define async_fibre_makecontext(c) \

            (!getcontext(&(c)->fibre) \

            && async_fibre_init(c) \

            && (makecontext(&(c)->fibre, async_start_func, 0), 1))

#  define async_fibre_init_dispatcher(d)



int async_fibre_init(async_fibre *fibre);

int async_fibre_makecontext(async_fibre *fibre);

void async_fibre_free(async_fibre *fibre);



# endif

#endif

#endif /* OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H */

crypto/async/arch/async_win.c

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
 * ====================================================================

 */



/* This must be the first #include file */

#include "../async_locl.h"



#ifdef ASYNC_WIN

crypto/async/arch/async_win.h

+1 −2
Original line number Diff line number Diff line
@@ -51,13 +51,12 @@ 
 * ====================================================================

 */



#include <openssl/async.h>



/*

 * This is the same detection used in cryptlib to set up the thread local

 * storage that we depend on, so just copy that

 */

#if defined(_WIN32) || defined(__CYGWIN__)

#include <openssl/async.h>

# define ASYNC_WIN

# define ASYNC_ARCH