From: Alicia Boya Garcia <ntrrgc@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Alicia Boya Garcia <ntrrgc@gmail.com>
Subject: [PATCH BlueZ] client: Fix uninitialized read in attribute handle
Date: Sun, 7 Aug 2022 21:20:14 +0200 [thread overview]
Message-ID: <20220807192013.74195-1-ntrrgc@gmail.com> (raw)
When services, characteristics and descriptors were parsed from DBus
proxies the client code was calling the print code without initializing
the `handle` field, which the print functions use.
This resulted in semi-random or zero handles in all attributes when
using gatt.list-attributes in bluetoothctl, depending on compilation
flags.
This patch fixes the problem by parsing the handle from the DBus proxy
path.
---
client/gatt.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/client/gatt.c b/client/gatt.c
index 21fd38ecf..4c074706c 100644
--- a/client/gatt.c
+++ b/client/gatt.c
@@ -158,6 +158,15 @@ static void print_inc_service(struct service *service, const char *description)
service->uuid, text);
}
+static uint16_t handle_from_path(const char *path)
+{
+ const char *number = path + strlen(path) - 4;
+ if (number < path)
+ return 0;
+
+ return (uint16_t) strtol(number, NULL, 16);
+}
+
static void print_service_proxy(GDBusProxy *proxy, const char *description)
{
struct service service;
@@ -178,6 +187,7 @@ static void print_service_proxy(GDBusProxy *proxy, const char *description)
service.path = (char *) g_dbus_proxy_get_path(proxy);
service.uuid = (char *) uuid;
service.primary = primary;
+ service.handle = handle_from_path(service.path);
print_service(&service, description);
}
@@ -259,6 +269,7 @@ static void print_characteristic(GDBusProxy *proxy, const char *description)
chrc.path = (char *) g_dbus_proxy_get_path(proxy);
chrc.uuid = (char *) uuid;
+ chrc.handle = handle_from_path(chrc.path);
print_chrc(&chrc, description);
}
@@ -352,6 +363,7 @@ static void print_descriptor(GDBusProxy *proxy, const char *description)
desc.path = (char *) g_dbus_proxy_get_path(proxy);
desc.uuid = (char *) uuid;
+ desc.handle = handle_from_path(desc.path);
print_desc(&desc, description);
}
--
2.37.1
next reply other threads:[~2022-08-07 19:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-07 19:20 Alicia Boya Garcia [this message]
2022-08-07 19:43 ` [BlueZ] client: Fix uninitialized read in attribute handle bluez.test.bot
-- strict thread matches above, loose matches on Subject: below --
2022-08-08 9:22 [PATCH BlueZ] " Alicia Boya Garcia
2022-08-08 20:08 ` Luiz Augusto von Dentz
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=20220807192013.74195-1-ntrrgc@gmail.com \
--to=ntrrgc@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