From 23e90ee76d4094f4c2866dcfa5925f31c8e11d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Wed, 2 Oct 2013 18:48:19 +0200 Subject: [PATCH] team: fix a crash on team devices (rh #1013593) teamd was being watched using g_bus_watch_name(). But when the NM team device was destroyed NM tried to remove the watcher with g_source_remove() instead of g_bus_unwatch_name(). Thus the watcher was not removed and teamd_dbus_appeared() was called on disposed device. https://bugzilla.redhat.com/show_bug.cgi?id=1013593#c28 Signed-off-by: Thomas Haller --- src/devices/nm-device-team.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/nm-device-team.c b/src/devices/nm-device-team.c index 896e94305f..82e59bcea5 100644 --- a/src/devices/nm-device-team.c +++ b/src/devices/nm-device-team.c @@ -241,7 +241,7 @@ teamd_cleanup (NMDevice *dev) NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (dev); if (priv->teamd_dbus_watch) { - g_source_remove (priv->teamd_dbus_watch); + g_bus_unwatch_name (priv->teamd_dbus_watch); priv->teamd_dbus_watch = 0; }