From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BAF9C43610 for ; Tue, 20 Nov 2018 09:31:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D98192075B for ; Tue, 20 Nov 2018 09:31:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=augury.com header.i=@augury.com header.b="F1GMOKQA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D98192075B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=augury.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727601AbeKTT7Q (ORCPT ); Tue, 20 Nov 2018 14:59:16 -0500 Received: from mail-vs1-f65.google.com ([209.85.217.65]:45346 "EHLO mail-vs1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727029AbeKTT7P (ORCPT ); Tue, 20 Nov 2018 14:59:15 -0500 Received: by mail-vs1-f65.google.com with SMTP id v10so657659vsv.12 for ; Tue, 20 Nov 2018 01:31:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=augury.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=DMvxNR8xJc/UPBOYQPsB4pMNvzoT7QPsHmcbnY7too0=; b=F1GMOKQA8SWYno+5taZ8qexCuKbWFBqGV5j+ApmfvH2C65bh1DwSnyqob6vCX9/Low Q8rLoscOxCudMTT7L8LLNNEIL4bez+UosV/PnpMPBLR1Vt8u5wENh4Wtd8EmCKKfN+z3 9m//Qrb74u23brC9ox0wYmwClvGUjYw0ragUI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=DMvxNR8xJc/UPBOYQPsB4pMNvzoT7QPsHmcbnY7too0=; b=DurXDulrpBUTxP/mRdLNoRAj0EO2moXn0l+Cr9Sf9qSpTCua5yKS+iAgY5k0WEr3c7 ZGH7ZDrNbGkBr9YE/2NsrksPn7v57o7B9HAGAhaASSpYab/rqXhTnvV5IQy3fjR5tS4I dU9wEyf31qJ4vNgXP41mrXmo8qoCMlXw6/F5NRncPA9FQv1PAEuAe1lWQHIRhYdONsy3 ldiHZZtGN6YO7QbWs9vODjomQTK3lrvYh2D22tNMxsX5hQydYq9AsdoGGvUpGIx2MHUk xGIZYoq72v1YtK+FSJVcncf1qRM1QEZBc4pM27nL8TUo6l0cGDAC8UoGopBll5maqNGe wNWw== X-Gm-Message-State: AGRZ1gKm/xDm98TQUyWyZSc/q7uZI3iONTKpX3xB+gRg0d65rrKW0DAD SdVzotB8dMqbgyRfMnrrJeqjTIIRuZzzQyFqDvC6QQ== X-Google-Smtp-Source: AJdET5c6gB9BR6vElNo3PZZR5tpnBrMsWDYgzT8MYH2ZiFl3gBk2DGg2pHqEkVfvLGXUTS0J9iUZr1jX4v+rtvKxQO0= X-Received: by 2002:a67:105:: with SMTP id 5mr497094vsb.183.1542706264560; Tue, 20 Nov 2018 01:31:04 -0800 (PST) MIME-Version: 1.0 References: <20181119154311.27826-1-luiz.dentz@gmail.com> In-Reply-To: From: Gal Ben Haim Date: Tue, 20 Nov 2018 11:30:53 +0200 Message-ID: Subject: Re: [PATCH BlueZ 1/5] gatt: Fix invalid read when disconnecting To: Luiz Augusto von Dentz Cc: linux-bluetooth@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org I can't apply this patch, not to the revision in master and not to the 5.50 tag On Tue, Nov 20, 2018 at 10:50 AM Luiz Augusto von Dentz wrote: > > On Mon, Nov 19, 2018 at 5:43 PM Luiz Augusto von Dentz > wrote: > > > > From: Luiz Augusto von Dentz > > > > In case there is a client of AcquireNotify and a disconnect happens the > > code not only have to free the client object but also destroy the io > > associated with it, for this reason the client object cannot be freed > > until the io is destroyed otherwise it may lead to the following error: > > > > Invalid read of size 4 > > at 0x63920: notify_io_destroy (gatt-client.c:1461) > > by 0x63EDB: pipe_io_destroy (gatt-client.c:1082) > > by 0x6405B: characteristic_free (gatt-client.c:1663) > > by 0x81F33: remove_interface (object.c:667) > > by 0x826CB: g_dbus_unregister_interface (object.c:1391) > > by 0x85D2B: queue_remove_all (queue.c:354) > > by 0x635F7: unregister_service (gatt-client.c:1893) > > by 0x85CF7: queue_remove_all (queue.c:339) > > by 0x661DF: btd_gatt_client_service_removed (gatt-client.c:2199) > > by 0x695CB: gatt_service_removed (device.c:3747) > > by 0x85B17: queue_foreach (queue.c:220) > > by 0x91283: notify_service_changed (gatt-db.c:280) > > by 0x91283: gatt_db_service_destroy (gatt-db.c:291) > > Address 0x515ed48 is 0 bytes inside a block of size 20 free'd > > at 0x483EAD0: free (vg_replace_malloc.c:530) > > by 0x85D2B: queue_remove_all (queue.c:354) > > by 0x636D3: unregister_characteristic (gatt-client.c:1741) > > by 0x85D2B: queue_remove_all (queue.c:354) > > by 0x635F7: unregister_service (gatt-client.c:1893) > > by 0x85CF7: queue_remove_all (queue.c:339) > > by 0x661DF: btd_gatt_client_service_removed (gatt-client.c:2199) > > by 0x695CB: gatt_service_removed (device.c:3747) > > by 0x85B17: queue_foreach (queue.c:220) > > by 0x91283: notify_service_changed (gatt-db.c:280) > > by 0x91283: gatt_db_service_destroy (gatt-db.c:291) > > by 0x85D2B: queue_remove_all (queue.c:354) > > by 0x91387: gatt_db_clear_range (gatt-db.c:475) > > --- > > src/gatt-client.c | 24 ++++++++++++------------ > > 1 file changed, 12 insertions(+), 12 deletions(-) > > > > diff --git a/src/gatt-client.c b/src/gatt-client.c > > index 234f46ed7..55aa5e423 100644 > > --- a/src/gatt-client.c > > +++ b/src/gatt-client.c > > @@ -1645,13 +1645,22 @@ static const GDBusMethodTable characteristic_methods[] = { > > { } > > }; > > > > +static void remove_client(void *data) > > +{ > > + struct notify_client *ntfy_client = data; > > + struct btd_gatt_client *client = ntfy_client->chrc->service->client; > > + > > + queue_remove(client->all_notify_clients, ntfy_client); > > + > > + notify_client_unref(ntfy_client); > > +} > > + > > static void characteristic_free(void *data) > > { > > struct characteristic *chrc = data; > > > > /* List should be empty here */ > > queue_destroy(chrc->descs, NULL); > > - queue_destroy(chrc->notify_clients, NULL); > > > > if (chrc->write_io) { > > queue_remove(chrc->service->client->ios, chrc->write_io->io); > > @@ -1663,6 +1672,8 @@ static void characteristic_free(void *data) > > pipe_io_destroy(chrc->notify_io); > > } > > > > + queue_destroy(chrc->notify_clients, remove_client); > > + > > g_free(chrc->path); > > free(chrc); > > } > > @@ -1715,16 +1726,6 @@ static struct characteristic *characteristic_create( > > return chrc; > > } > > > > -static void remove_client(void *data) > > -{ > > - struct notify_client *ntfy_client = data; > > - struct btd_gatt_client *client = ntfy_client->chrc->service->client; > > - > > - queue_remove(client->all_notify_clients, ntfy_client); > > - > > - notify_client_unref(ntfy_client); > > -} > > - > > static void unregister_characteristic(void *data) > > { > > struct characteristic *chrc = data; > > @@ -1738,7 +1739,6 @@ static void unregister_characteristic(void *data) > > if (chrc->write_op) > > bt_gatt_client_cancel(gatt, chrc->write_op->id); > > > > - queue_remove_all(chrc->notify_clients, NULL, NULL, remove_client); > > queue_remove_all(chrc->descs, NULL, NULL, unregister_descriptor); > > > > g_dbus_unregister_interface(btd_get_dbus_connection(), chrc->path, > > -- > > 2.17.2 > > Can you try with this set to see it does work properly. > > -- > Luiz Augusto von Dentz