shared/gatt-db: Fix gatt_db_service_insert_characteristic
Luiz Augusto von Dentz
maintainerPATCH 1/1 shared/gatt-db: Fix gatt_db_service_insert_characteristic
From: Luiz Augusto von Dentz <[email protected]>
gatt_db_service_insert_characteristic shall not attempt to insert the characteristic attribute handle on the next available index as there could be descriptors in between so this changes the way get_attribute_index calculates the index based on the given handle to properly skip indexes used by descriptors.
--- monitor/att.c | 7 +-- src/gatt-database.c | 7 +-- src/settings.c | 3 +- src/shared/gatt-client.c | 3 ++ src/shared/gatt-db.c | 101 +++++++++++++++++++++++---------------- src/shared/gatt-db.h | 2 + unit/test-gatt.c | 1 + 7 files changed, 76 insertions(+), 48 deletions(-)
monitor/att.c +4 -3
@@ -506,6 +506,7 @@ static struct gatt_db *get_db(const struct l2cap_frame *frame, bool rsp)static struct gatt_db_attribute *insert_chrc (const struct l2cap_frame *frame,uint16_t handle, +uint16_t value_handle,bt_uuid_t *uuid,uint8_t prop,bool rsp) {
@@ -515,8 +516,8 @@ static struct gatt_db_attribute *insert_chrc(const struct l2cap_frame *frame,if (!db)return NULL ; -return gatt_db_insert_characteristic (db, handle, uuid,0 , prop,NULL , -NULL ,NULL ); +return gatt_db_insert_characteristic (db, handle, value_handle, uuid,0 , + prop,NULL ,NULL ,NULL ); }static int bt_uuid_from_data (bt_uuid_t *uuid,const void *data,uint16_t size)
@@ -615,7 +616,7 @@ static void print_chrc(const struct l2cap_frame *frame)print_uuid (" Value UUID" , frame->data, frame->size);bt_uuid_from_data (&uuid, frame->data, frame->size); -insert_chrc (frame, handle, &uuid, prop, true); +insert_chrc (frame, handle -1 , handle, &uuid, prop, true); }static void chrc_read (const struct l2cap_frame *frame)
src/gatt-database.c +4 -3
@@ -3352,9 +3352,10 @@ static bool database_add_chrc(struct external_service *service, } chrc->attrib =gatt_db_service_insert_characteristic (service->attrib, - handle, &uuid, chrc->perm, - chrc->props, chrc_read_cb, - chrc_write_cb, chrc); + handle -1 , handle, &uuid, + chrc->perm, chrc->props, + chrc_read_cb, chrc_write_cb, + chrc);if (!chrc->attrib) {error ("Failed to create characteristic entry in database" );return false;
src/settings.c +2 -1
@@ -125,7 +125,8 @@ static int load_chrc(struct gatt_db *db, char *handle, char *value, handle_int, value_handle, properties, val_len ? val_str : "", uuid_str); - att =gatt_db_service_insert_characteristic (service, value_handle, + att =gatt_db_service_insert_characteristic (service, handle_int, + value_handle, &uuid,0 , properties,NULL ,NULL ,NULL );if (!att ||gatt_db_attribute_get_handle (att) != value_handle)
src/shared/gatt-client.c +3 -0
@@ -735,6 +735,7 @@ static bool discover_descs(struct discovery_op *op, bool *discovering) } attr = gatt_db_insert_characteristic(client->db, + chrc_data->start_handle, chrc_data->value_handle, &chrc_data->uuid, 0, chrc_data->properties,
@@ -829,6 +830,8 @@ done:return true; failed: +DBG (client,"Failed to discover descriptors" ); +free (chrc_data);return false; }
src/shared/gatt-db.c +60 -41
198 lines not on this page · raw message
src/shared/gatt-db.h +2 -0
@@ -63,6 +63,7 @@ gatt_db_service_add_characteristic(struct gatt_db_attribute *attrib,struct gatt_db_attribute * gatt_db_service_insert_characteristic(struct gatt_db_attribute *attrib, uint16_t handle, + uint16_t value_handle, const bt_uuid_t *uuid, uint32_t permissions, uint8_t properties,
@@ -73,6 +74,7 @@ gatt_db_service_insert_characteristic(struct gatt_db_attribute *attrib,struct gatt_db_attribute * gatt_db_insert_characteristic(struct gatt_db *db, uint16_t handle, + uint16_t value_handle, const bt_uuid_t *uuid, uint32_t permissions, uint8_t properties,
unit/test-gatt.c +1 -0
@@ -1237,6 +1237,7 @@ add_char_with_value(struct gatt_db_attribute *service_att, uint16_t handle,if (handle) attrib = gatt_db_service_insert_characteristic(service_att, + handle - 1, handle, uuid, att_permissions, char_properties,
Signature · 1 line
2.44.0
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=842520
---Test result---
Test Summary:
CheckPatch PASS 0.52 seconds GitLint PASS 0.31 seconds BuildEll PASS 24.58 seconds BluezMake PASS 1681.37 seconds MakeCheck PASS 13.38 seconds MakeDistcheck PASS 174.59 seconds CheckValgrind PASS 250.29 seconds CheckSmatch WARNING 353.90 seconds bluezmakeextell PASS 118.80 seconds IncrementalBuild PASS 1477.58 seconds ScanBuild WARNING 985.63 seconds
Details
##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:monitor/att.c: note: in included file:monitor/display.h:82:26: warning: Variable length array is used.
##############################
Test: ScanBuild - WARNING
Desc: Run Scan Build
Output:src/shared/gatt-client.c:451:21: warning: Use of memory after it is freed
gatt_db_unregister(op->client->db, op->db_id);
^~~~~~~~~~
src/shared/gatt-client.c:696:2: warning: Use of memory after it is freed
discovery_op_complete(op, false, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:996:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1102:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1294:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1359:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1634:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1639:2: warning: Use of memory after it is freed
discover_all(op);
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2143:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2151:8: warning: Use of memory after it is freed
discovery_op_ref(op),
^~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3240:2: warning: Use of memory after it is freed
complete_write_long_op(req, success, 0, false);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3262:2: warning: Use of memory after it is freed
request_unref(req);
^~~~~~~~~~~~~~~~~~12 warnings generated.
---
Regards,
Linux Bluetooth
This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 9 lines · On Mon, 8 Apr 2024 11:59:49 -0400 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
gatt_db_service_insert_characteristicshall not attempt to insert the characteristic attribute handle on the next available index as there could be descriptors in between so this changes the wayget_attribute_indexcalculates the index based on the given handle to properly skip indexes used by descriptors.[...]
Here is the summary with links:
- [BlueZ,v1] shared/gatt-db: Fix gatt_db_service_insert_characteristic
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=7604a577c9d7
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html