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

libnm-glib: fix a crash when using multiple NMClients

Browse source 
NMObjectCache was assuming there would never be more than one object
with the same path, but since NMClient is an NMObject, it was getting
cached too, so if you created two clients and then unreffed one of
them, it's possible the wrong one could get left in the cache, causing
a crash the next time the other one called nm_object_cache_clear().

Fix this by only adding NMObjects to the cache in the codepaths where
we also check to see if the object was already in the cache.

(This also means we can remove the "except" argument to
nm_object_cache_clear(), since the NMClient won't be cached any more.)

(cherry picked from commit fe264a2d01)
This commit is contained in:
Dan Winship 2014-07-31 09:21:05 -04:00
parent edf0317dff
commit 1b8835e15b
4 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnm-glib/nm-client.c
View file

@ -1385,7 +1385,7 @@ proxy_name_owner_changed (DBusGProxy *proxy,
/* Clear object cache to ensure bad refcounting by clients doesn't
* keep objects in the cache.
*/
_nm_object_cache_clear (NM_OBJECT (client));
_nm_object_cache_clear ();
} else {
_nm_object_suppress_property_updates (NM_OBJECT (client), FALSE);
_nm_object_reload_properties_async (NM_OBJECT (client), updated_properties, client);

26
libnm-glib/nm-object-cache.c
View file

@ -65,27 +65,27 @@ _nm_object_cache_get (const char *path)
}
void
_nm_object_cache_clear (NMObject *except)
_nm_object_cache_clear (void)
{
GHashTableIter iter;
NMObject *obj;
GObject *obj;
const char *path;
char *foo;
_init_cache ();
if (!cache)
return;
g_hash_table_iter_init (&iter, cache);
while (g_hash_table_iter_next (&iter, (gpointer) &path, (gpointer) &obj)) {
if (obj != except) {
/* Remove the callback so that if the object isn't yet released
* by a client, when it does finally get unrefed, it won't trigger
* the cache removal for a new object with the same path as the
* one being released.
*/
foo = g_object_steal_data (G_OBJECT (obj), "nm-object-cache-tag");
g_free (foo);
/* Remove the callback so that if the object isn't yet released
* by a client, when it does finally get unrefed, it won't trigger
* the cache removal for a new object with the same path as the
* one being released.
*/
foo = g_object_steal_data (obj, "nm-object-cache-tag");
g_free (foo);
g_hash_table_iter_remove (&iter);
}
g_hash_table_iter_remove (&iter);
}
}

2
libnm-glib/nm-object-cache.h
View file

@ -32,7 +32,7 @@ G_BEGIN_DECLS
/* Returns referenced object from the cache */
NMObject *_nm_object_cache_get (const char *path);
void _nm_object_cache_add (NMObject *object);
void _nm_object_cache_clear (NMObject *except);
void _nm_object_cache_clear (void);
G_END_DECLS

6
libnm-glib/nm-object.c
View file

@ -159,8 +159,6 @@ constructor (GType type,
return NULL;
}
_nm_object_cache_add (NM_OBJECT (object));
return object;
}
@ -578,6 +576,8 @@ _nm_object_create (GType type, DBusGConnection *connection, const char *path)
NM_OBJECT_DBUS_CONNECTION, connection,
NM_OBJECT_DBUS_PATH, path,
NULL);
if (NM_IS_OBJECT (object))
_nm_object_cache_add (NM_OBJECT (object));
if (!g_initable_init (G_INITABLE (object), NULL, &error)) {
dbgmsg ("Could not create object for %s: %s", path, error->message);
g_error_free (error);
@ -661,6 +661,8 @@ async_got_type (GType type, gpointer user_data)
NM_OBJECT_DBUS_PATH, async_data->path,
NULL);
g_warn_if_fail (object != NULL);
if (NM_IS_OBJECT (object))
_nm_object_cache_add (NM_OBJECT (object));
g_async_initable_init_async (G_ASYNC_INITABLE (object), G_PRIORITY_DEFAULT,
NULL, async_inited, async_data);
}