Hi Luiz,
On Mon, Jul 8, 2013 at 5:28 PM, Luiz Augusto von Dentz
<luiz.dentz@xxxxxxxxx> wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
>
> btd_service do alter its state on service_remove which can cause
> plugins to attempt to access services list which may have freed some
> services already.
>
> To fix this the code now updates the list in place so the services are
> first removed from services list before calling service_remove.
> ---
> src/device.c | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/src/device.c b/src/device.c
> index afb0cfc..5a1f9c1 100644
> --- a/src/device.c
> +++ b/src/device.c
> @@ -993,8 +993,12 @@ int device_block(struct btd_device *device, gboolean update_only)
> if (device->connected)
> do_disconnect(device);
>
> - g_slist_free_full(device->services, remove_service);
> - device->services = NULL;
> + while (device->services != NULL) {
> + struct btd_service *service = device->services->data;
> +
> + device->services = g_slist_remove(device->services, service);
> + service_remove(service);
> + }
>
> if (!update_only)
> err = btd_adapter_block_address(device->adapter,
> @@ -2361,7 +2365,6 @@ static void device_remove_stored(struct btd_device *device)
>
> void device_remove(struct btd_device *device, gboolean remove_stored)
> {
> -
> DBG("Removing device %s", device->path);
>
> if (device->bonding) {
> @@ -2378,10 +2381,12 @@ void device_remove(struct btd_device *device, gboolean remove_stored)
> if (device->browse)
> browse_request_cancel(device->browse);
>
> - g_slist_foreach(device->services, dev_disconn_service, NULL);
Wouldn't it be better to split this change to a separate patch? I
believe it could be subject to backport or revert.
> + while (device->services != NULL) {
> + struct btd_service *service = device->services->data;
>
> - g_slist_free(device->pending);
> - device->pending = NULL;
Why are the two lines above removed?
> + device->services = g_slist_remove(device->services, service);
> + service_remove(service);
> + }
>
> if (device->connected)
> do_disconnect(device);
> @@ -2397,9 +2402,6 @@ void device_remove(struct btd_device *device, gboolean remove_stored)
> if (remove_stored)
> device_remove_stored(device);
>
> - g_slist_free_full(device->services, remove_service);
> - device->services = NULL;
> -
> btd_device_unref(device);
> }
>
> --
> 1.8.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Cheers,
Mikel
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
