generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Async error handling and MacOS/X fixes

Browse Source 
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: Matt Caswell <matt@openssl.org>
This commit is contained in:
Viktor Dukhovni
2015-11-21 20:14:43 -05:00
parent 3d32218812
commit 6e8ac50870
7 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
crypto/async/arch/async_posix.c
View File

@@ -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->fibre.uc_stack.ss_size = STACKSIZE;
fibre->fibre.uc_link = NULL;
fibre->env_init = 0;
return 1;
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;
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);
OPENSSL_free(fibre->fibre.uc_stack.ss_sp);
fibre->fibre.uc_stack.ss_sp = NULL;
}
int async_pipe(OSSL_ASYNC_FD *pipefds)