diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-12-11 18:18:17 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-12-12 08:43:51 +0100 |
| commit | 8945ec3bad5ed48bfe6e8aa7eaf354fc471cd877 (patch) | |
| tree | 62a4ab499d9f431f7a4d80ce8009f428486c988b | |
| parent | 7d1de49475c04081fbcb75fc12e972e0fbf4fd90 (diff) | |
| download | NetworkManager-th/secret-key-with-machine-id.tar.gz | |
core: fix race creating secret-keyth/secret-key-with-machine-id
Reading the secret key may result in generating and
writing a new key to disk.
Do that under the lock.
| -rw-r--r-- | src/nm-core-utils.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index b160155d5a..18a415e4fc 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -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); |