[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  37cbabbdb8c701a4d29c448cf6994fe154f43afa (commit)
       via  7eb26c4936898b165c88d1dcadfa22d34cb25d15 (commit)
      from  3e5d9da5fc45a5d129e0daa7211125eba097c3dd (commit)


- Log -----------------------------------------------------------------
commit 37cbabbdb8c701a4d29c448cf6994fe154f43afa
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jan 13 11:19:48 2017 +0100

    UI: Use RUN_ONCE differently
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2222)

commit 7eb26c4936898b165c88d1dcadfa22d34cb25d15
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jan 12 20:22:12 2017 +0100

    UI: Ensure there will be no race condition when getting the UI_METHOD ex_data
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2222)

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

Summary of changes:
 crypto/ui/ui_util.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/crypto/ui/ui_util.c b/crypto/ui/ui_util.c
index 70202a6..67b2ec2 100644
--- a/crypto/ui/ui_util.c
+++ b/crypto/ui/ui_util.c
@@ -8,6 +8,7 @@
  */
 
 #include <string.h>
+#include "internal/thread_once.h"
 #include "ui_locl.h"
 
 #ifndef BUFSIZ
@@ -83,18 +84,15 @@ static void ui_free_method_data(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
     OPENSSL_free(ptr);
 }
 
-static int ui_method_data_index()
+static CRYPTO_ONCE get_index_once = CRYPTO_ONCE_STATIC_INIT;
+static int ui_method_data_index = -1;
+DEFINE_RUN_ONCE_STATIC(ui_method_data_index_init)
 {
-    static int idx = -1;
-
-    if (idx == -1)
-        idx = CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_UI_METHOD,
-                                      0, NULL,
-                                      ui_new_method_data,
-                                      ui_dup_method_data,
-                                      ui_free_method_data);
-
-    return idx;
+    ui_method_data_index = CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_UI_METHOD,
+                                                   0, NULL, ui_new_method_data,
+                                                   ui_dup_method_data,
+                                                   ui_free_method_data);
+    return 1;
 }
 
 static int ui_open(UI *ui)
@@ -108,8 +106,7 @@ static int ui_read(UI *ui, UI_STRING *uis)
         {
             char result[PEM_BUFSIZE];
             const struct pem_password_cb_data *data =
-                UI_method_get_ex_data(UI_get_method(ui),
-                                      ui_method_data_index());
+                UI_method_get_ex_data(UI_get_method(ui), ui_method_data_index);
             int maxsize = UI_get_result_maxsize(uis);
             int len = data->cb(result,
                                maxsize > PEM_BUFSIZE ? PEM_BUFSIZE : maxsize,
@@ -150,7 +147,8 @@ UI_METHOD *UI_UTIL_wrap_read_pem_callback(pem_password_cb *cb, int rwflag)
         || UI_method_set_reader(ui_method, ui_read) < 0
         || UI_method_set_writer(ui_method, ui_write) < 0
         || UI_method_set_closer(ui_method, ui_close) < 0
-        || UI_method_set_ex_data(ui_method, ui_method_data_index(), data) < 0) {
+        || !RUN_ONCE(&get_index_once, ui_method_data_index_init)
+        || UI_method_set_ex_data(ui_method, ui_method_data_index, data) < 0) {
         UI_destroy_method(ui_method);
         OPENSSL_free(data);
         return NULL;