From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 4D88723A2D for ; Mon, 14 May 2018 03:13:47 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JMFguMwVuC8r for ; Mon, 14 May 2018 03:13:47 -0400 (EDT) Received: from smtp43.i.mail.ru (smtp43.i.mail.ru [94.100.177.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 973CF239E9 for ; Mon, 14 May 2018 03:13:46 -0400 (EDT) From: Alexander Turenko Subject: [tarantool-patches] [PATCH] Use automatic storage for digest.pbkdf2 results Date: Mon, 14 May 2018 10:13:28 +0300 Message-Id: <06ec3d50d0f58b15199a7230f82769ca3a702154.1526281547.git.alexander.turenko@tarantool.org> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: Ilya Markov , Kirill Yukhin Cc: Alexander Turenko , tarantool-patches@freelists.org It prevents rewriting result by an another thread after coio_call(), but before lua_pushlstring(). Such case is possible because libeio uses thread pool internally and static __thread storage can be reused before lua_pushlstring() if many parallel digest.pbkdf2() calls are on the fly. Fixes #3396. --- branch: Totktonada/gh-3396-reentrant-digest-pbkdf2 travis-ci: https://travis-ci.org/tarantool/tarantool/builds/378586123 (broken on centos 7 due to https://bugs.centos.org/view.php?id=14769) Don't sure my understanding of the problem is right, but the fix works for the test case I have posted into the issue. I would be appreciated for comments re source of the issue. src/lua/digest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lua/digest.c b/src/lua/digest.c index bf738b3f5..b0572baf7 100644 --- a/src/lua/digest.c +++ b/src/lua/digest.c @@ -79,7 +79,7 @@ lua_pbkdf2(lua_State *L) const char *salt = lua_tostring(L, 2); int num_iterations = lua_tointeger(L, 3); int digest_len = lua_tointeger(L, 4); - static __thread unsigned char digest[PBKDF2_MAX_DIGEST_SIZE]; + unsigned char digest[PBKDF2_MAX_DIGEST_SIZE]; if (coio_call(digest_pbkdf2_f, password, strlen(password), salt, strlen(salt), digest, num_iterations, digest_len) < 0) { @@ -99,4 +99,4 @@ tarantool_lua_digest_init(struct lua_State *L) }; luaL_register_module(L, "digest", lua_digest_methods); lua_pop(L, 1); -}; \ No newline at end of file +}; -- 2.15.1