Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp803414pxb; Thu, 5 Nov 2020 13:28:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJxYZPpG/lXoth+71LCe9VYbncZIlg0TaT8sbx0JThc3s1xRqvzJtsKk0Pm14SzmyOXllvME X-Received: by 2002:a17:906:17d1:: with SMTP id u17mr4236629eje.6.1604611726948; Thu, 05 Nov 2020 13:28:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604611726; cv=none; d=google.com; s=arc-20160816; b=AcpcN9W4krJTnzEPmOeCCtRbNuN3F9A51AZqLBFOg/qSq74S07bEqprBIuL9zrwV/4 Mp+1qXS2d1PnKlznENV3LLOitXuSEjWXiYlwonBEeUsPE/7uxoKbsrI3kI0nxp+qWYJ9 56HqiMZsIdFFlNBcC+RE7NXMF51Zq46gq7JpVmOFwxQtFqOKh8yfzg8g1kKrMAL4LU8S UMxndH5GxSVf7TWhVV3gdNH9oe8bn3CQzwGtleWdA/WtR8mS4HWc/uec82BFI3VrfBmP Wm3mB2AgPxADMax5ewHk7H08kq2EOqUopB9C/jrqoDGnZnuNle63s8e7kJXfL+oQNj6C j+4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=uIA+HhBLJfupd/WHnlmOI5DUlyRHln9xbhe/3RAMQbw=; b=m3dDN/WTlgpuAaT9RK9k8IhX8CIIMukWFDbnT2bQvkgInFNI6HqQrAovtgDukNmeUJ nBB+aajnuc5Z7qWXzZwDCp5aQmM2m1pNc9gScwhOQBrX1rrGfECt2tzg8RXsI0NfyD0e 17gBjCUdgX/BeCxty7lX8Azk1RmAbumYGGb+Y+6iE0UUNgmMgqbnk/g6vSNCVB47Sedz aGo3/s3Bqv1oZU8jlA4/ScWTgiaSTRWYIln8dYxbxsNU3L2g5HE4jEe9cYdV+Kb5vIyr +sZFqsTo0nBfeK/VVUrrT+lxMk5JD48zX+mjTzlQnflJJJPrWn/m0iWeNDRzbxhagZMl OZ6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=sAGUkTr4; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f4si2193835eja.252.2020.11.05.13.28.14; Thu, 05 Nov 2020 13:28:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=sAGUkTr4; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731694AbgKEV2L (ORCPT + 99 others); Thu, 5 Nov 2020 16:28:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726729AbgKEV2L (ORCPT ); Thu, 5 Nov 2020 16:28:11 -0500 Received: from mail-ot1-x342.google.com (mail-ot1-x342.google.com [IPv6:2607:f8b0:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 819FEC0613CF for ; Thu, 5 Nov 2020 13:28:11 -0800 (PST) Received: by mail-ot1-x342.google.com with SMTP id j14so2831612ots.1 for ; Thu, 05 Nov 2020 13:28:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=uIA+HhBLJfupd/WHnlmOI5DUlyRHln9xbhe/3RAMQbw=; b=sAGUkTr46zkybMnMM8eK5GihDv8c0kcIvQ7p8lNQdz+bk/lVL+47gikhP89T0E/wc7 IUK6q4mMC5ZaKuSCHLWPSAgtZPJsR+u1XyZLLBv351H8EgLcpfnEGy3ENM3Uz0EKxYv+ OvtGamBpC4rt1FFWoJYQXt+FltI/nkRWt9MkRJYbOLF+2X/YWwIRagtwA6Zpnyv8KpeR Xy3PN/moU2UdoZKHmBNvwKixqsnVpWdkY+h76wavsm+5vHfY7wZNGyxd0B75CZrVyurO tx3pK9nZKhQNUisYtl0EbRlfV9APC7+/fi2wU3G0nMCPA1d82fBtNNh1bP1/X+7t+Er7 YWbQ== 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=uIA+HhBLJfupd/WHnlmOI5DUlyRHln9xbhe/3RAMQbw=; b=FFpMIMHGj4tji5w7XWg8Vxwvi7cU+w+K+J+AxkPwMiwzgXYwMabGxJ82zfReF00riE 1X5j8D4G3B6vLczRxY048XvoFOp1F0bGKqDHqGDrjeENKpvJltunHC3zVNa8IDEUVeoe 64giU5TIeimD1sphTJG0Qa/ivFu5HnaS8LpjM7yS85d87ltb8ryZB2Sxk82U9Arp8wf1 oF4kFnDkdPIlqlnKWR3Yabap1CopvCgXCvEC9TzE1rxSZlYFrcUO+D2R3WlPmPS3UmEr CFU2wq+ZoT0S23/z9ONpuU1weUUckG6pmGVqkwULYV8jLeTmsorCcA6ErEpMCWeXvCy4 MQsA== X-Gm-Message-State: AOAM530/FHOSnjw9cijYdFv2G1meqjcsyizWrL4dxt2o3CVu5R9/Kb/6 K6eRTgeedA4Nz4Ld5oZj2LB9J7Mckle3eGgWp13UN7p1nz2PfA== X-Received: by 2002:a9d:6a0a:: with SMTP id g10mr3111890otn.44.1604611690647; Thu, 05 Nov 2020 13:28:10 -0800 (PST) MIME-Version: 1.0 References: <20201105002412.37720-1-sonnysasaka@chromium.org> In-Reply-To: From: Luiz Augusto von Dentz Date: Thu, 5 Nov 2020 13:27:59 -0800 Message-ID: Subject: Re: [PATCH BlueZ] gatt-client: Do not continue service discovery if disconnected To: Sonny Sasaka Cc: "linux-bluetooth@vger.kernel.org" , Archie Pusaka Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Hi Sonny, On Thu, Nov 5, 2020 at 1:10 PM Sonny Sasaka wrote: > > Hi Luiz, > > bt_gatt_client is not freed. It is expected that bt_gatt_client is > still alive at discovery_op_complete since the code clearly references > it. It is the gatt_db_attribute objects in client->pending_svcs that > are already freed. That probably means there are other references, also if the attributes are being freed that probably means gatt_db_clear has been called which would explain why I could not reproduce, that said we should invoke bt_gatt_client_cancel_all before cleanup the db. > On Thu, Nov 5, 2020 at 1:03 PM Luiz Augusto von Dentz > wrote: > > > > Hi Sonny, > > > > On Thu, Nov 5, 2020 at 11:20 AM Sonny Sasaka wrote: > > > > > > Hi Luiz, > > > > > > > > > On Thu, Nov 5, 2020 at 10:46 AM Luiz Augusto von Dentz > > > wrote: > > > > > > > > Hi Sonny, > > > > > > > > On Wed, Nov 4, 2020 at 10:01 PM Sonny Sasaka wrote: > > > > > > > > > > If device is disconnected, discovery_complete_op should not continue > > > > > processing since this can lead to a crash because the GATT-related > > > > > objects may already be freed. > > > > > > > > > > Sample crash stack trace: > > > > > 0 gatt_db_service_get_handles (service=0x1751130, service=0x1751130, end_handle=0x7ffcd600806e, start_handle=0x7ffcd600806c) at src/shared/gatt-db.c:569 > > > > > 1 gatt_db_attribute_get_service_data (attrib=, start_handle=0x7ffcd600806c, end_handle=0x7ffcd600806e, primary=0x0, uuid=0x0) at src/shared/gatt-db.c:1657 > > > > > 2 0x00000000004983a8 in discovery_op_complete (op=op@entry=0x173b320, success=, err=err@entry=10 '\n') at src/shared/gatt-client.c:406 > > > > > 3 0x000000000049a548 in discover_descs_cb (success=, att_ecode=, result=, user_data=0x173b320) at src/shared/gatt-client.c:915 > > > > > 4 0x00000000004a1d87 in discovery_op_complete (op=0x1748450, success=, ecode=) at src/shared/gatt-helpers.c:615 > > > > > 5 0x00000000004a2379 in discover_descs_cb (opcode=, pdu=0x174d551, length=, user_data=0x1748450) at src/shared/gatt-helpers.c:1465 > > > > > 6 0x00000000004966db in handle_rsp (pdu_len=4, pdu=, opcode=, chan=0x17483c0) at src/shared/att.c:814 > > > > > 7 can_read_data (io=, user_data=0x17483c0) at src/shared/att.c:1011 > > > > > > > > Weird, are you still receiving data after the device is disconnected? > > > To be more precise, this happens if I do "remove device" from > > > bluetoothctl while it's still doing GATT discovery, i.e. connect and > > > quickly remove device. Also this is reproducible if the GATT.Cache > > > config is set to "yes". So, the "disconnection" may not be physical > > > but a consequence of the code path of the RemoveDevice API. I can > > > reproduce it almost 100% of the time with an LE Mouse (tried with MS > > > Mouse 3600 and Logitech M355). > > > > > > > > > 8 0x00000000004a0853 in watch_callback (channel=, cond=, user_data=) at src/shared/io-glib.c:157 > > > > > 9 0x00007fb3f2d7fe87 in g_main_context_dispatch () from /usr/lib64/libglib-2.0.so.0 > > > > > 10 0x00007fb3f2d80230 in ?? () from /usr/lib64/libglib-2.0.so.0 > > > > > 11 0x00007fb3f2d80542 in g_main_loop_run () from /usr/lib64/libglib-2.0.so.0 > > > > > 12 0x00000000004a0e25 in mainloop_run () at src/shared/mainloop-glib.c:66 > > > > > 13 0x00000000004a11f2 in mainloop_run_with_signal (func=func@entry=0x43f200 , user_data=user_data@entry=0x0) at src/shared/mainloop-notify.c:188 > > > > > 14 0x000000000040c72e in main (argc=, argv=) at src/main.c:959 > > > > > > > > > > Reviewed-By: Archie Pusaka > > > > > > > > > > --- > > > > > src/device.c | 3 +++ > > > > > src/shared/gatt-client.c | 20 ++++++++++++++++++++ > > > > > src/shared/gatt-client.h | 2 ++ > > > > > 3 files changed, 25 insertions(+) > > > > > > > > > > diff --git a/src/device.c b/src/device.c > > > > > index a5ef46730..9dad746eb 100644 > > > > > --- a/src/device.c > > > > > +++ b/src/device.c > > > > > @@ -586,6 +586,9 @@ static void gatt_client_cleanup(struct btd_device *device) > > > > > device->gatt_ready_id = 0; > > > > > } > > > > > > > > > > + /* Make sure that service discovery is stopped if any is in progress */ > > > > > + bt_gatt_client_reset_in_discovery(device->client); > > > > > > > > Does this means that other references will also get interrupted? That > > > > is something very weird here since when disconnected the bt_att > > > > instance should actually have informed the bt_gatt_client and the > > > > cleanup should had happened there. > > > What do you mean by "other references"? My guess is that > > > bt_gatt_client has done the cleanup, but discovery_op_complete still > > > tries to execute the whole code path which involves accessing the > > > already cleaned-up gatt_db_attribute objects. > > > > Here normally what should have happened is: > > > > bt_gatt_client_unref -> bt_gatt_client_free -> > > bt_gatt_client_cancel_all -> bt_gatt_request_unref -> > > discovery_op_unref -> discovery_op_free > > > > So there is something about this code path that is not really working > > as intended or perhaps bt_gatt_client_free is never really called? It > > would perhaps be worth trying to reproduce this with a a unit test. > > > > > > > > > > > + > > > > > bt_gatt_client_unref(device->client); > > > > > device->client = NULL; > > > > > } > > > > > diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c > > > > > index 8becf1c6c..2ba6efe9a 100644 > > > > > --- a/src/shared/gatt-client.c > > > > > +++ b/src/shared/gatt-client.c > > > > > @@ -104,6 +104,9 @@ struct bt_gatt_client { > > > > > > > > > > struct bt_gatt_request *discovery_req; > > > > > unsigned int mtu_req_id; > > > > > + > > > > > + /* Whether there is a service discovery operation ongoing */ > > > > > + bool in_discovery; > > > > > }; > > > > > > > > > > struct request { > > > > > @@ -381,6 +384,12 @@ static void discovery_op_complete(struct discovery_op *op, bool success, > > > > > { > > > > > const struct queue_entry *svc; > > > > > > > > > > + /* Service discovery may be reset due to disconnection */ > > > > > + if (!op->client->in_discovery) > > > > > + return; > > > > > + > > > > > + op->client->in_discovery = false; > > > > > + > > > > > op->success = success; > > > > > > > > > > /* Read database hash if discovery has been successful */ > > > > > @@ -1857,6 +1866,9 @@ static void process_service_changed(struct bt_gatt_client *client, > > > > > { > > > > > struct discovery_op *op; > > > > > > > > > > + if (client->in_discovery) > > > > > + goto fail; > > > > > + > > > > > op = discovery_op_create(client, start_handle, end_handle, > > > > > service_changed_complete, > > > > > service_changed_failure); > > > > > @@ -1869,6 +1881,7 @@ static void process_service_changed(struct bt_gatt_client *client, > > > > > discovery_op_ref(op), > > > > > discovery_op_unref); > > > > > if (client->discovery_req) { > > > > > + client->in_discovery = true; > > > > > client->in_svc_chngd = true; > > > > > return; > > > > > } > > > > > @@ -2057,6 +2070,7 @@ static bool gatt_client_init(struct bt_gatt_client *client, uint16_t mtu) > > > > > return false; > > > > > } > > > > > > > > > > + client->in_discovery = true; > > > > > client->in_init = true; > > > > > > > > > > return true; > > > > > @@ -2080,6 +2094,7 @@ discover: > > > > > } > > > > > > > > > > done: > > > > > + client->in_discovery = true; > > > > > client->in_init = true; > > > > > return true; > > > > > } > > > > > @@ -3694,3 +3709,8 @@ int bt_gatt_client_get_security(struct bt_gatt_client *client) > > > > > > > > > > return bt_att_get_security(client->att, NULL); > > > > > } > > > > > + > > > > > +void bt_gatt_client_reset_in_discovery(struct bt_gatt_client *client) > > > > > +{ > > > > > + client->in_discovery = false; > > > > > +} > > > > > diff --git a/src/shared/gatt-client.h b/src/shared/gatt-client.h > > > > > index dc5102394..dcd8e5cf6 100644 > > > > > --- a/src/shared/gatt-client.h > > > > > +++ b/src/shared/gatt-client.h > > > > > @@ -126,3 +126,5 @@ bool bt_gatt_client_unregister_notify(struct bt_gatt_client *client, > > > > > > > > > > bool bt_gatt_client_set_security(struct bt_gatt_client *client, int level); > > > > > int bt_gatt_client_get_security(struct bt_gatt_client *client); > > > > > + > > > > > +void bt_gatt_client_reset_in_discovery(struct bt_gatt_client *client); > > > > > -- > > > > > 2.26.2 > > > > > > > > > > > > > > > > > -- > > > > Luiz Augusto von Dentz > > > > > > > > -- > > Luiz Augusto von Dentz -- Luiz Augusto von Dentz