btd_gatt_client_service_removed() can be called reentrantly via bt_gatt_client_unref() after the services queue has already been freed, resulting in a use-after-free.
Reset client->ready to false before destroying the services queue to prevent reentrant calls from dereferencing freed memory. Upstream-Status: Backport [bluez/bluez@d01616f] Signed-off-by: Jinwang Li <[email protected]> --- meta/recipes-connectivity/bluez5/bluez5.inc | 1 + ...use-after-free-caused-by-reentrant-c.patch | 59 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-gatt-client-Fix-use-after-free-caused-by-reentrant-c.patch diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 843e36b..c792cc9 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -70,6 +70,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-Revert-shared-shell-Don-t-init-input-for-non-interac.patch \ file://0001-tools-Work-around-broken-stdin-handling-in-home-made.patch \ + file://0001-gatt-client-Fix-use-after-free-caused-by-reentrant-c.patch \ " S = "${UNPACKDIR}/bluez-${PV}" diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-gatt-client-Fix-use-after-free-caused-by-reentrant-c.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-gatt-client-Fix-use-after-free-caused-by-reentrant-c.patch new file mode 100644 index 0000000..0fcbc08 --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5/0001-gatt-client-Fix-use-after-free-caused-by-reentrant-c.patch @@ -0,0 +1,59 @@ +From 45c167591d04e2dfecf5b4642168e54c23abbd40 Mon Sep 17 00:00:00 2001 +From: Jinwang Li <[email protected]> +Date: Sun, 26 Apr 2026 21:25:15 +0800 +Subject: [PATCH 2/2] gatt-client: Fix use-after-free caused by reentrant + client teardown + +btd_gatt_client_service_removed() can be called reentrantly via +bt_gatt_client_unref() after the services queue has already been freed, +resulting in a use-after-free. + +Reset client->ready to false before destroying the services queue to +prevent reentrant calls from dereferencing freed memory. + +This was found with the following backtrace: + + #0 match_service_handle () + #1 queue_remove_if () + #2 queue_remove_all () + #3 btd_gatt_client_service_removed () + #4 gatt_service_removed () + #5 handle_notify () + #6 queue_foreach () + #7 notify_service_changed () + #8 gatt_db_service_destroy () + #9 queue_remove_all () + #10 gatt_db_clear_range () + #11 service_changed_failure () + #12 discovery_op_unref () + #13 bt_gatt_request_unref () + #14 bt_gatt_client_cancel_all () + #15 bt_gatt_client_free () + #16 bt_gatt_client_unref () + #17 bt_gatt_client_free () + #18 bt_gatt_client_unref () + #19 btd_gatt_client_destroy () + #20 device_free () + +Signed-off-by: Jinwang Li <[email protected]> +Upstream-Status: Backport [commit d01616f0c276a441dad8afe4e8f7bb261b26ba0a] +--- + src/gatt-client.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gatt-client.c b/src/gatt-client.c +index 374e67c..3baf95c 100644 +--- a/src/gatt-client.c ++++ b/src/gatt-client.c +@@ -2261,6 +2261,8 @@ void btd_gatt_client_destroy(struct btd_gatt_client *client) + if (!client) + return; + ++ client->ready = false; ++ + queue_destroy(client->services, unregister_service); + queue_destroy(client->all_notify_clients, NULL); + queue_destroy(client->ios, NULL); +-- +2.34.1 + -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#237039): https://lists.openembedded.org/g/openembedded-core/message/237039 Mute This Topic: https://lists.openembedded.org/mt/119313830/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
