2022-12-02 00:51:43

by Luiz Augusto von Dentz

Subject: [PATCH BlueZ] shared/gatt-client: Fix not checking valid ranges

From: Luiz Augusto von Dentz <[email protected]>

When attempting to update discovery ranges the code shall verify if the
range is still valid (handles != 0x0000 and start < end).
---
src/shared/gatt-client.c | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c
index 45b6ed92fde1..cf0d2e2b749d 100644
--- a/src/shared/gatt-client.c
+++ b/src/shared/gatt-client.c
@@ -1018,6 +1018,20 @@ static bool match_handle_range(const void *data, const void *match_data)
(match_range->start <= range->end);
}

+static struct handle_range *range_new(uint16_t start, uint16_t end)
+{
+ struct handle_range *range;
+
+ if (!start || !end || start > end)
+ return NULL;
+
+ range = new0(struct handle_range, 1);
+ range->start = start;
+ range->end = end;
+
+ return range;
+}
+
static void remove_discov_range(struct discovery_op *op, uint16_t start,
uint16_t end)
{
@@ -1034,16 +1048,18 @@ static void remove_discov_range(struct discovery_op *op, uint16_t start,
if ((range->start == start) && (range->end == end)) {
queue_remove(op->discov_ranges, range);
free(range);
- } else if (range->start == start)
+ } else if (range->start == start) {
range->start = end + 1;
- else if (range->end == end)
+ if (!range->start || range->start > range->end) {
+ queue_remove(op->discov_ranges, range);
+ free(range);
+ }
+ } else if (range->end == end)
range->end = start - 1;
else {
- new_range = new0(struct handle_range, 1);
- new_range->start = end + 1;
- new_range->end = range->end;
-
- queue_push_after(op->discov_ranges, range, new_range);
+ new_range = range_new(end + 1, range->end);
+ if (new_range)
+ queue_push_after(op->discov_ranges, range, new_range);

range->end = start - 1;
}
--
2.37.3

2022-12-02 02:10:02

by bluez.test.bot

Subject: RE: [BlueZ] shared/gatt-client: Fix not checking valid ranges

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=701025

---Test result---

Test Summary:
CheckPatch PASS 0.52 seconds
GitLint PASS 0.35 seconds
BuildEll PASS 27.30 seconds
BluezMake PASS 867.15 seconds
MakeCheck PASS 11.62 seconds
MakeDistcheck PASS 145.87 seconds
CheckValgrind PASS 241.01 seconds
bluezmakeextell PASS 94.09 seconds
IncrementalBuild PASS 699.42 seconds
ScanBuild WARNING 991.88 seconds

Details
##############################
Test: ScanBuild - WARNING
Desc: Run Scan Build
Output:
src/shared/gatt-client.c:387:21: warning: Use of memory after it is freed
gatt_db_unregister(op->client->db, op->db_id);
^~~~~~~~~~
src/shared/gatt-client.c:600:2: warning: Use of memory after it is freed
discovery_op_complete(op, false, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:900:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1009:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1201:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1266:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1537:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1542:2: warning: Use of memory after it is freed
discover_all(op);
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2044:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2052:8: warning: Use of memory after it is freed
discovery_op_ref(op),
^~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3135:2: warning: Use of memory after it is freed
complete_write_long_op(req, success, 0, false);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3157:2: warning: Use of memory after it is freed
request_unref(req);
^~~~~~~~~~~~~~~~~~
12 warnings generated.



---
Regards,
Linux Bluetooth