fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 17:18:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: fix releasing thead-local stack of NMPNetns instances

Browse source 
Fixes: 12df49f8ab ('platform: make NMPNetns thread-safe')
(cherry picked from commit b433c21ae4)
This commit is contained in:
Thomas Haller 2021-06-30 23:19:44 +02:00
parent 963c395cc2
commit 724ef83e06
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libnm-platform/nmp-netns.c
View file

@ -11,7 +11,6 @@
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <pthread.h>
#include "libnm-log-core/nm-logging.h" #include "libnm-log-core/nm-logging.h"
@ -151,20 +150,13 @@ _netns_stack_get_impl(void)
{ {
gs_unref_object NMPNetns *netns = NULL; gs_unref_object NMPNetns *netns = NULL;
gs_free_error GError *error = NULL; gs_free_error GError *error = NULL;
pthread_key_t key;
GArray * s; GArray * s;
s = g_array_new(FALSE, FALSE, sizeof(NetnsInfo)); s = g_array_new(FALSE, FALSE, sizeof(NetnsInfo));
g_array_set_clear_func(s, _netns_stack_clear_cb); g_array_set_clear_func(s, _netns_stack_clear_cb);
_netns_stack = s; _netns_stack = s;
/* register a destructor function to cleanup the array. If we fail nm_utils_thread_local_register_destroy(s, (GDestroyNotify) g_array_unref);
* 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");
/* at the bottom of the stack we must try to create a netns instance /* 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. */ * that we never pop. It's the base to which we need to return. */