diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2013-10-02 18:48:19 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2013-10-02 20:05:05 +0200 |
| commit | 23e90ee76d4094f4c2866dcfa5925f31c8e11d04 (patch) | |
| tree | ecf6946b74c5681f125f1b0893fcc44670f25a00 | |
| parent | e4fc7440ccc00a989678804bba246fa542551042 (diff) | |
| download | NetworkManager-23e90ee76d4094f4c2866dcfa5925f31c8e11d04.tar.gz | |
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 <thaller@redhat.com>
| -rw-r--r-- | src/devices/nm-device-team.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |