From: Gianluca Altomani <altomanigianluca@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Gianluca Altomani <altomanigianluca@gmail.com>
Subject: [PATCH BlueZ 2/2] shared/gatt-client: Fix double-queued service
Date: Wed, 30 Sep 2026 11:39:28 +0200 [thread overview]
Message-ID: <20260930093928.360745-3-altomanigianluca@gmail.com> (raw)
In-Reply-To: <20260930093928.360745-1-altomanigianluca@gmail.com>
discovery_op_create() loads every service already in the client
database into pending_svcs, active or not, and discovery_found_service()
then queues an inactive service again when it finds it. A service left
inactive by an earlier discovery that was cut short therefore ends up
in the queue twice.
If that discovery fails too, discovery_op_complete() walks pending_svcs
with its removal callback already unregistered: the first entry removes
and frees the service, and the second one dereferences it:
gatt_db_service_get_active (src/shared/gatt-db.c)
discovery_op_complete (src/shared/gatt-client.c)
Only queue an inactive service if it is not pending already.
Assisted-by: Claude:claude-opus-5-5
---
src/shared/gatt-client.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c
index 95f83fa3e..3520b5cad 100644
--- a/src/shared/gatt-client.c
+++ b/src/shared/gatt-client.c
@@ -1170,10 +1170,16 @@ static void discovery_found_service(struct discovery_op *op,
{
/* Skip if service already active */
if (!gatt_db_service_get_active(attr)) {
- /* Skip if there are no attributes */
+ /*
+ * Skip if there are no attributes. An inactive service left by
+ * an interrupted discovery is already pending from
+ * discovery_op_create(); queueing it twice makes
+ * discovery_op_complete() free it and then dereference the
+ * second entry.
+ */
if (end == start)
gatt_db_service_set_active(attr, true);
- else
+ else if (!queue_find(op->pending_svcs, NULL, attr))
queue_push_tail(op->pending_svcs, attr);
if (start < op->svc_first)
--
2.55.0
prev parent reply other threads:[~2026-09-30 9:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-30 9:39 [PATCH BlueZ 0/2] Fix use-after-free in GATT client discovery Gianluca Altomani
2026-09-30 9:39 ` [PATCH BlueZ 1/2] shared/gatt-db: Always notify service removal Gianluca Altomani
2026-09-30 15:13 ` Fix use-after-free in GATT client discovery bluez.test.bot
2026-09-30 9:39 ` Gianluca Altomani [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260930093928.360745-3-altomanigianluca@gmail.com \
--to=altomanigianluca@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox