From: Pavel Maltsev <pavelm@google.com>
To: linux-bluetooth@vger.kernel.org
Cc: Pavel Maltsev <pavelm@google.com>
Subject: [PATCH] Fix duplicate free for GATT service includes
Date: Thu, 19 Nov 2020 21:43:37 +0000 [thread overview]
Message-ID: <20201119214337.3886160-1-pavelm@google.com> (raw)
Objects in the service->includes queue are obtained via
dbus_message_iter_get_basic call and according to the
contract for the value is that it is returned by the reference
and should not be freed thus we should make a copy.
This will fix the issue when the GATT service app is disconnected
(reproduced with gatt-service included in bluez), bluetoothd is crashing:
bluetoothd: src/gatt-database.c:gatt_db_service_removed() Local GATT service removed
bluetoothd: src/adapter.c:adapter_service_remove() /org/bluez/hci0
bluetoothd: src/adapter.c:remove_uuid() sending remove uuid command for index 0
bluetoothd: src/sdpd-service.c:remove_record_from_server() Removing record with handle 0x10006
bluetoothd: src/gatt-database.c:proxy_removed_cb() Proxy removed - removing service: /service1
munmap_chunk(): invalid pointer
---
src/gatt-database.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/gatt-database.c b/src/gatt-database.c
index 6694a0174..90cc4bade 100644
--- a/src/gatt-database.c
+++ b/src/gatt-database.c
@@ -1999,6 +1999,7 @@ static bool parse_includes(GDBusProxy *proxy, struct external_service *service)
DBusMessageIter iter;
DBusMessageIter array;
char *obj;
+ char *includes;
int type;
/* Includes property is optional */
@@ -2017,7 +2018,11 @@ static bool parse_includes(GDBusProxy *proxy, struct external_service *service)
dbus_message_iter_get_basic(&array, &obj);
- if (!queue_push_tail(service->includes, obj)) {
+ includes = g_strdup(obj);
+ if (!includes)
+ return false;
+
+ if (!queue_push_tail(service->includes, includes)) {
error("Failed to add Includes path in queue\n");
return false;
}
--
2.29.2.299.gdc1121823c-goog
next reply other threads:[~2020-11-19 21:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-19 21:43 Pavel Maltsev [this message]
2020-11-19 22:31 ` Fix duplicate free for GATT service includes bluez.test.bot
-- strict thread matches above, loose matches on Subject: below --
2020-11-20 0:22 [PATCH] " Pavel Maltsev
2020-11-19 20:02 Pavel Maltsev
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=20201119214337.3886160-1-pavelm@google.com \
--to=pavelm@google.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