device: Disconnect service when disabling device

We should disconnect service instead of disconnecting network
when device is disabled. Otherwise service might still have
a pointer to network that is no longer valid.

Fixes BMC#24592

diff --git a/src/device.c b/src/device.c
index 6a34d406a5d48e4e1c6484d3c7ca78f55ae4fe78..276734703bc670fb7cd629224acbd76e3e2dec48 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -306,8 +306,15 @@ int __connman_device_disable(struct connman_device *device)
 
        clear_scan_trigger(device);
 
-       if (device->network)
-               connman_network_set_connected(device->network, FALSE);
+       if (device->network) {
+               struct connman_service *service =
+                       __connman_service_lookup_from_network(device->network);
+
+               if (service != NULL)
+                       __connman_service_disconnect(service);
+               else
+                       connman_network_set_connected(device->network, FALSE);
+       }
 
        err = device->driver->disable(device);
        if (err == 0) {