[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  689f112d9806fa4a0c2f8c108226639455bc770d (commit)
      from  de6ac50ddc6c901d43afcd914a1708f9b87efcf2 (commit)


- Log -----------------------------------------------------------------
commit 689f112d9806fa4a0c2f8c108226639455bc770d
Author: Matt Caswell <matt at openssl.org>
Date:   Thu May 4 12:51:18 2017 +0100

    Don't leave stale errors on queue if DSO_dsobyaddr() fails
    
    The init code uses DSO_dsobyaddr() to leak a reference to ourselves to
    ensure we remain loaded until atexit() time. In some circumstances that
    can fail and leave stale errors on the error queue.
    
    Fixes #3372
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3383)

-----------------------------------------------------------------------

Summary of changes:
 crypto/init.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crypto/init.c b/crypto/init.c
index 8036654..265d54d 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -107,13 +107,15 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_base)
 # else
     /*
      * Deliberately leak a reference to ourselves. This will force the library
-     * to remain loaded until the atexit() handler is run a process exit.
+     * to remain loaded until the atexit() handler is run at process exit.
      */
     {
         DSO *dso = NULL;
 
+        ERR_set_mark();
         dso = DSO_dsobyaddr(&base_inited, DSO_FLAG_NO_UNLOAD_ON_FREE);
         DSO_free(dso);
+        ERR_pop_to_mark();
     }
 # endif
 #endif
@@ -648,8 +650,10 @@ int OPENSSL_atexit(void (*handler)(void))
         {
             DSO *dso = NULL;
 
+            ERR_set_mark();
             dso = DSO_dsobyaddr(handlersym.sym, DSO_FLAG_NO_UNLOAD_ON_FREE);
             DSO_free(dso);
+            ERR_pop_to_mark();
         }
 # endif
     }