fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 02:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: fix race creating secret-key

Browse source 
Reading the secret key may result in generating and
writing a new key to disk.

Do that under the lock.
This commit is contained in:
Thomas Haller 2018-12-11 18:18:17 +01:00
parent deb19abf22
commit bc9f18c609
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/nm-core-utils.c
View file

@ -2670,7 +2670,7 @@ out:
}
typedef struct {
const guint8 *secret_key;
guint8 *secret_key;
gsize key_len;
bool is_good:1;
} SecretKeyData;
@ -2685,19 +2685,14 @@ nm_utils_secret_key_get (const guint8 **out_secret_key,
again:
secret_key = g_atomic_pointer_get (&secret_key_static);
if (G_UNLIKELY (!secret_key)) {
static gsize init_value = 0;
static SecretKeyData secret_key_data;
gboolean tmp_success;
gs_free guint8 *tmp_secret_key = NULL;
gsize tmp_key_len;
static gsize init_value = 0;
tmp_success = _secret_key_read (&tmp_secret_key, &tmp_key_len);
if (!g_once_init_enter (&init_value))
goto again;
secret_key_data.secret_key = g_steal_pointer (&tmp_secret_key);
secret_key_data.key_len = tmp_key_len;
secret_key_data.is_good = tmp_success;
secret_key_data.is_good = _secret_key_read (&secret_key_data.secret_key,
&secret_key_data.key_len);
secret_key = &secret_key_data;
g_atomic_pointer_set (&secret_key_static, secret_key);
g_once_init_leave (&init_value, 1);