Skip to contentSkip to conversation

Fix duplicate free for GATT service includes

PATCH In review Pavel Maltsev 2 participants 2 messages Nov 19, 2020 Bluetooth drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix duplicate free for GATT service includes

Service includes object is obtained via dbus_message_iter_get_basic call and according to the contract for the value is that it is returned by the references and should not be freed so we should make a copy.

The issue I'm running is when the GATT service app is disconnected (reproduced with gatt-service included in bluez), bluetoothd is crashing:

bluetoothd[9771]: src/gatt-database.c:gatt_db_service_removed() Local GATT service removed bluetoothd[9771]: src/adapter.c:adapter_service_remove() /org/bluez/hci0 bluetoothd[9771]: src/adapter.c:remove_uuid() sending remove uuid command for index 0 bluetoothd[9771]: src/sdpd-service.c:remove_record_from_server() Removing record with handle 0x10006 bluetoothd[9771]: src/gatt-database.c:proxy_removed_cb() Proxy removed - removing service: /service1 munmap_chunk(): invalid pointer

---
 src/gatt-database.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
src/gatt-database.c +5 -1
index 6694a0174..04b49e2c1 100644
@@ -2017,7 +2017,11 @@ static bool parse_includes(GDBusProxy *proxy, struct external_service *service)
 
 		dbus_message_iter_get_basic(&array, &obj);
 
-		if (!queue_push_tail(service->includes, obj)) {
+		const char* includes = g_strdup(obj);
+		if (!includes)
+			return false;
+
+		if (!queue_push_tail(service->includes, includes)) {
 			error("Failed to add Includes path in queue\n");
 			return false;
 		}
Signature · 1 line
2.29.2.299.gdc1121823c-goog
#1 lore raw

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

---Test result---

##############################
Test: CheckPatch - FAIL
Output:
Fix duplicate free for GATT service includes
WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #13:
bluetoothd[9771]: src/gatt-database.c:gatt_db_service_removed() Local GATT service removed

ERROR:POINTER_LOCATION: "foo* bar" should be "foo *bar" #31: FILE: src/gatt-database.c:2020:
+ const char* includes = g_strdup(obj);

WARNING:LINE_SPACING: Missing a blank line after declarations #32: FILE: src/gatt-database.c:2021:
+ const char* includes = g_strdup(obj);
+ if (!includes)

- total: 1 errors, 2 warnings, 12 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.

"[PATCH] Fix duplicate free for GATT service includes" has style problems, please review.

NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPLIT_STRING SSCANF_TO_KSTRTO

NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.

##############################
Test: CheckGitLint - FAIL
Output:
Fix duplicate free for GATT service includes
10: B1 Line exceeds max length (90>80): "bluetoothd[9771]: src/gatt-database.c:gatt_db_service_removed() Local GATT service removed" 12: B1 Line exceeds max length (85>80): "bluetoothd[9771]: src/adapter.c:remove_uuid() sending remove uuid command for index 0" 13: B1 Line exceeds max length (100>80): "bluetoothd[9771]: src/sdpd-service.c:remove_record_from_server() Removing record with handle 0x10006" 14: B1 Line exceeds max length (100>80): "bluetoothd[9771]: src/gatt-database.c:proxy_removed_cb() Proxy removed - removing service: /service1"

##############################
Test: CheckBuild - FAIL
Output:
ar: u' modifier ignored since D' is the default (see `U')
ar: u' modifier ignored since D' is the default (see `U')
ar: u' modifier ignored since D' is the default (see `U')
ar: u' modifier ignored since D' is the default (see `U')
ar: u' modifier ignored since D' is the default (see `U')
src/gatt-database.c: In function ‘parse_includes’:
src/gatt-database.c:2020:3: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]

 2020 |   const char* includes = g_strdup(obj);
      |   ^~~~~

src/gatt-database.c:2024:43: error: passing argument 2 of ‘queue_push_tail’ discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
2024 | if (!queue_push_tail(service->includes, includes)) {
| ^~~~~~~~
In file included from src/gatt-database.c:27:
./src/shared/queue.h:25:49: note: expected ‘void *’ but argument is of type ‘const char *’
25 | bool queue_push_tail(struct queue *queue, void *data);
| ~~~~~~^~~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:9022: src/bluetoothd-gatt-database.o] Error 1
make: *** [Makefile:4020: all] Error 2

##############################
Test: MakeCheck - SKIPPED
Output:
checkbuild not success

---
Regards,
Linux Bluetooth