diff options
author | Thomas Haller <thaller@redhat.com> | 2021-06-30 23:19:44 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2021-07-05 14:51:27 +0200 |
commit | b433c21ae47949329c973c0a58d6df16068bf629 (patch) | |
tree | c0c65751b54d214cc5468755713232d6ecb7393b | |
parent | 5bc39d97834c5ba9d81e6f38e07f19eb4e9fd398 (diff) | |
download | NetworkManager-b433c21ae47949329c973c0a58d6df16068bf629.tar.gz |
platform: fix releasing thead-local stack of NMPNetns instances
Fixes: 12df49f8ab45 ('platform: make NMPNetns thread-safe')
-rw-r--r-- | src/libnm-platform/nmp-netns.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/libnm-platform/nmp-netns.c b/src/libnm-platform/nmp-netns.c index aea5b3b6dc..2b28a4cd43 100644 --- a/src/libnm-platform/nmp-netns.c +++ b/src/libnm-platform/nmp-netns.c @@ -11,7 +11,6 @@ #include <sys/mount.h> #include <sys/stat.h> #include <sys/types.h> -#include <pthread.h> #include "libnm-log-core/nm-logging.h" @@ -151,20 +150,13 @@ _netns_stack_get_impl(void) { gs_unref_object NMPNetns *netns = NULL; gs_free_error GError *error = NULL; - pthread_key_t key; GArray * s; s = g_array_new(FALSE, FALSE, sizeof(NetnsInfo)); g_array_set_clear_func(s, _netns_stack_clear_cb); _netns_stack = s; - /* register a destructor function to cleanup the array. If we fail - * to do so, we will leak NMPNetns instances (and their file descriptor) when the - * thread exits. */ - if (pthread_key_create(&key, (void (*)(void *)) g_array_unref) != 0) - _LOGE(NULL, "failure to initialize thread-local storage"); - else if (pthread_setspecific(key, s) != 0) - _LOGE(NULL, "failure to set thread-local storage"); + nm_utils_thread_local_register_destroy(s, (GDestroyNotify) g_array_unref); /* at the bottom of the stack we must try to create a netns instance * that we never pop. It's the base to which we need to return. */ |