diff mbox series

[Bluez,v2] gatt-db: fix service in range check

Message ID 20210728212259.Bluez.v2.1.I20397b8350f98567b8d52b895442c768250a6ab3@changeid (mailing list archive)
State Superseded
Delegated to: Luiz Von Dentz
Headers show
Series [Bluez,v2] gatt-db: fix service in range check | expand

Commit Message

Howard Chung July 28, 2021, 1:23 p.m. UTC
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(-)

Comments

bluez.test.bot@gmail.com July 28, 2021, 1:43 p.m. UTC | #1
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=522683

---Test result---

Test Summary:
CheckPatch                    PASS      0.29 seconds
GitLint                       PASS      0.11 seconds
Prep - Setup ELL              PASS      40.81 seconds
Build - Prep                  PASS      0.09 seconds
Build - Configure             PASS      7.35 seconds
Build - Make                  PASS      176.55 seconds
Make Check                    FAIL      8.72 seconds
Make Distcheck                FAIL      190.86 seconds
Build w/ext ELL - Configure   PASS      7.24 seconds
Build w/ext ELL - Make        PASS      165.61 seconds

Details
##############################
Test: CheckPatch - PASS
Desc: Run checkpatch.pl script with rule in .checkpatch.conf

##############################
Test: GitLint - PASS
Desc: Run gitlint with rule in .gitlint

##############################
Test: Prep - Setup ELL - PASS
Desc: Clone, build, and install ELL

##############################
Test: Build - Prep - PASS
Desc: Prepare environment for build

##############################
Test: Build - Configure - PASS
Desc: Configure the BlueZ source tree

##############################
Test: Build - Make - PASS
Desc: Build the BlueZ source tree

##############################
Test: Make Check - FAIL
Desc: Run 'make check'
Output:
./test-driver: line 107: 28579 Aborted                 (core dumped) "$@" > $log_file 2>&1
make[3]: *** [Makefile:9910: test-suite.log] Error 1
make[2]: *** [Makefile:10018: check-TESTS] Error 2
make[1]: *** [Makefile:10412: check-am] Error 2
make: *** [Makefile:10414: check] Error 2


##############################
Test: Make Distcheck - FAIL
Desc: Run distcheck to check the distribution
Output:
../../test-driver: line 107: 47458 Aborted                 (core dumped) "$@" > $log_file 2>&1
make[4]: *** [Makefile:9910: test-suite.log] Error 1
make[3]: *** [Makefile:10018: check-TESTS] Error 2
make[2]: *** [Makefile:10412: check-am] Error 2
make[1]: *** [Makefile:10414: check] Error 2
make: *** [Makefile:10335: distcheck] Error 1


##############################
Test: Build w/ext ELL - Configure - PASS
Desc: Configure BlueZ source with '--enable-external-ell' configuration

##############################
Test: Build w/ext ELL - Make - PASS
Desc: Build BlueZ source with '--enable-external-ell' configuration



---
Regards,
Linux Bluetooth
Luiz Augusto von Dentz July 28, 2021, 5:38 p.m. UTC | #2
Hi Howard,

On Wed, Jul 28, 2021 at 6:45 AM <bluez.test.bot@gmail.com> wrote:
>
> 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=522683
>
> ---Test result---
>
> Test Summary:
> CheckPatch                    PASS      0.29 seconds
> GitLint                       PASS      0.11 seconds
> Prep - Setup ELL              PASS      40.81 seconds
> Build - Prep                  PASS      0.09 seconds
> Build - Configure             PASS      7.35 seconds
> Build - Make                  PASS      176.55 seconds
> Make Check                    FAIL      8.72 seconds
> Make Distcheck                FAIL      190.86 seconds

These will need to be fixed, I suspect removing the check completely
is wrong since the condition svc_start < foreach_data->start is not
tested.

> Build w/ext ELL - Configure   PASS      7.24 seconds
> Build w/ext ELL - Make        PASS      165.61 seconds
>
> Details
> ##############################
> Test: CheckPatch - PASS
> Desc: Run checkpatch.pl script with rule in .checkpatch.conf
>
> ##############################
> Test: GitLint - PASS
> Desc: Run gitlint with rule in .gitlint
>
> ##############################
> Test: Prep - Setup ELL - PASS
> Desc: Clone, build, and install ELL
>
> ##############################
> Test: Build - Prep - PASS
> Desc: Prepare environment for build
>
> ##############################
> Test: Build - Configure - PASS
> Desc: Configure the BlueZ source tree
>
> ##############################
> Test: Build - Make - PASS
> Desc: Build the BlueZ source tree
>
> ##############################
> Test: Make Check - FAIL
> Desc: Run 'make check'
> Output:
> ./test-driver: line 107: 28579 Aborted                 (core dumped) "$@" > $log_file 2>&1
> make[3]: *** [Makefile:9910: test-suite.log] Error 1
> make[2]: *** [Makefile:10018: check-TESTS] Error 2
> make[1]: *** [Makefile:10412: check-am] Error 2
> make: *** [Makefile:10414: check] Error 2
>
>
> ##############################
> Test: Make Distcheck - FAIL
> Desc: Run distcheck to check the distribution
> Output:
> ../../test-driver: line 107: 47458 Aborted                 (core dumped) "$@" > $log_file 2>&1
> make[4]: *** [Makefile:9910: test-suite.log] Error 1
> make[3]: *** [Makefile:10018: check-TESTS] Error 2
> make[2]: *** [Makefile:10412: check-am] Error 2
> make[1]: *** [Makefile:10414: check] Error 2
> make: *** [Makefile:10335: distcheck] Error 1
>
>
> ##############################
> Test: Build w/ext ELL - Configure - PASS
> Desc: Configure BlueZ source with '--enable-external-ell' configuration
>
> ##############################
> Test: Build w/ext ELL - Make - PASS
> Desc: Build BlueZ source with '--enable-external-ell' configuration
>
>
>
> ---
> Regards,
> Linux Bluetooth
>
diff mbox series

Patch

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];