Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 28 Jul 2021 21:23:04 +0800
Message-Id: <20210728212259.Bluez.v2.1.I20397b8350f98567b8d52b895442c768250a6ab3@changeid>
Mime-Version: 1.0
Subject: [Bluez PATCH v2] gatt-db: fix service in range check
From:   Howard Chung <howardchung@google.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     Yun-Hao Chung <howardchung@chromium.org>,
        Archie Pusaka <apusaka@chromium.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

From: Yun-Hao Chung <howardchung@chromium.org>

The previous check already makes sure the service range overlaps with
the search range. There is no need to add another check.

Reviewed-by: Archie Pusaka <apusaka@chromium.org>
---

Changes in v2:
- remove the entire check

 src/shared/gatt-db.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/shared/gatt-db.c b/src/shared/gatt-db.c
index 8bff4d37aaa2..658f82812cf6 100644
--- a/src/shared/gatt-db.c
+++ b/src/shared/gatt-db.c
@@ -1347,12 +1347,8 @@ static void foreach_in_range(void *data, void *user_data)
 	if (svc_start > foreach_data->end || svc_end < foreach_data->start)
 		return;
 
-	if (!foreach_data->attr) {
-		if (svc_start < foreach_data->start ||
-					svc_start > foreach_data->end)
-			return;
+	if (!foreach_data->attr)
 		return foreach_service_in_range(data, user_data);
-	}
 
 	for (i = 0; i < service->num_handles; i++) {
 		struct gatt_db_attribute *attribute = service->attributes[i];
-- 
2.32.0.432.gabb21c7263-goog