* [PATCH] [BlueZ] adapter: Fix execute "LE Add Device To Resolving List" command fail
@ 2024-07-22 7:56 clancy_shang
2024-07-22 8:48 ` Paul Menzel
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: clancy_shang @ 2024-07-22 7:56 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Clancy Shang
From: Clancy Shang <clancy.shang@quectel.com>
According to BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 4, Part E,
7.8.38, If there is an existing entry in the resolving list with the same
non-zero Peer_IRK, the Controller should return the error code Invalid
HCI Command Parameters (0x12), so fix it.
Signed-off-by: Clancy Shang <clancy.shang@quectel.com>
---
src/adapter.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/src/adapter.c b/src/adapter.c
index 85ddfc165..495c9f631 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -8901,6 +8901,76 @@ static void store_irk(struct btd_adapter *adapter, const bdaddr_t *peer,
g_key_file_free(key_file);
}
+static void delete_exist_irk_from_directory(
+ struct btd_adapter *adapter,
+ const unsigned char *key)
+{
+ char dirname[PATH_MAX];
+ GError *gerr = NULL;
+ DIR *dir;
+ struct dirent *entry;
+
+ create_filename(dirname, PATH_MAX, "/%s",
+ btd_adapter_get_storage_dir(adapter));
+
+ dir = opendir(dirname);
+ if (!dir) {
+ btd_error(adapter->dev_id,
+ "Unable to open adapter storage directory: %s",
+ dirname);
+ return;
+ }
+
+ while ((entry = readdir(dir)) != NULL) {
+ struct btd_device *device;
+ char filename[PATH_MAX];
+ GKeyFile *key_file;
+ struct irk_info *irk_info;
+ uint8_t bdaddr_type;
+
+ if (entry->d_type == DT_UNKNOWN)
+ entry->d_type = util_get_dt(dirname, entry->d_name);
+
+ if (entry->d_type != DT_DIR || bachk(entry->d_name) < 0)
+ continue;
+
+ create_filename(filename, PATH_MAX, "/%s/%s/info",
+ btd_adapter_get_storage_dir(adapter),
+ entry->d_name);
+
+ key_file = g_key_file_new();
+ if (!g_key_file_load_from_file(
+ key_file,
+ filename,
+ 0,
+ &gerr)) {
+ error("Unable to load key file from %s: (%s)",
+ filename, gerr->message);
+ g_clear_error(&gerr);
+ }
+
+ bdaddr_type = get_le_addr_type(key_file);
+
+ irk_info = get_irk_info(key_file, entry->d_name, bdaddr_type);
+
+ if (irk_info) {
+ if (!memcmp(irk_info->val, key, 16)) {
+ DBG("Has same irk,delete it");
+ device = btd_adapter_find_device(adapter,
+ &irk_info->bdaddr,
+ irk_info->bdaddr_type);
+ if (device)
+ btd_adapter_remove_device(adapter,
+ device);
+ }
+ }
+ g_key_file_free(key_file);
+ }
+
+ closedir(dir);
+
+}
+
static void new_irk_callback(uint16_t index, uint16_t length,
const void *param, void *user_data)
{
@@ -8950,6 +9020,8 @@ static void new_irk_callback(uint16_t index, uint16_t length,
if (!persistent)
return;
+ delete_exist_irk_from_directory(adapter, irk->val);
+
store_irk(adapter, &addr->bdaddr, addr->type, irk->val);
btd_device_set_temporary(device, false);
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] [BlueZ] adapter: Fix execute "LE Add Device To Resolving List" command fail
2024-07-22 7:56 [PATCH] [BlueZ] adapter: Fix execute "LE Add Device To Resolving List" command fail clancy_shang
@ 2024-07-22 8:48 ` Paul Menzel
2024-07-22 9:38 ` bluez.test.bot
2024-07-22 14:57 ` [PATCH] " Luiz Augusto von Dentz
2 siblings, 0 replies; 6+ messages in thread
From: Paul Menzel @ 2024-07-22 8:48 UTC (permalink / raw)
To: Clancy Shang; +Cc: linux-bluetooth, Clancy Shang
Dear Clancy,
Thank you for your patch. Some minor comments.
Am 22.07.24 um 09:56 schrieb clancy_shang@163.com:
> From: Clancy Shang <clancy.shang@quectel.com>
>
> According to BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 4, Part E,
I’d spell it *Bluetooth Core Specification* [1].
> 7.8.38, If there is an existing entry in the resolving list with the same
I’d spell *If* lowercase.
> non-zero Peer_IRK, the Controller should return the error code Invalid
> HCI Command Parameters (0x12), so fix it.
You could describe the current situation, so what is returned right now.
Also, it’d be great if you documented the test environment how to
reproduce the issue.
[1]: https://www.bluetooth.com/specifications/specs/core54-html/
> Signed-off-by: Clancy Shang <clancy.shang@quectel.com>
> ---
> src/adapter.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 72 insertions(+)
>
> diff --git a/src/adapter.c b/src/adapter.c
> index 85ddfc165..495c9f631 100644
> --- a/src/adapter.c
> +++ b/src/adapter.c
> @@ -8901,6 +8901,76 @@ static void store_irk(struct btd_adapter *adapter, const bdaddr_t *peer,
> g_key_file_free(key_file);
> }
>
> +static void delete_exist_irk_from_directory(
> + struct btd_adapter *adapter,
> + const unsigned char *key)
> +{
> + char dirname[PATH_MAX];
> + GError *gerr = NULL;
> + DIR *dir;
> + struct dirent *entry;
> +
> + create_filename(dirname, PATH_MAX, "/%s",
> + btd_adapter_get_storage_dir(adapter));
> +
> + dir = opendir(dirname);
> + if (!dir) {
> + btd_error(adapter->dev_id,
> + "Unable to open adapter storage directory: %s",
> + dirname);
> + return;
> + }
> +
> + while ((entry = readdir(dir)) != NULL) {
> + struct btd_device *device;
> + char filename[PATH_MAX];
> + GKeyFile *key_file;
> + struct irk_info *irk_info;
> + uint8_t bdaddr_type;
> +
> + if (entry->d_type == DT_UNKNOWN)
> + entry->d_type = util_get_dt(dirname, entry->d_name);
> +
> + if (entry->d_type != DT_DIR || bachk(entry->d_name) < 0)
> + continue;
> +
> + create_filename(filename, PATH_MAX, "/%s/%s/info",
> + btd_adapter_get_storage_dir(adapter),
> + entry->d_name);
> +
> + key_file = g_key_file_new();
> + if (!g_key_file_load_from_file(
> + key_file,
> + filename,
> + 0,
> + &gerr)) {
No idea, if it’s my mailer, but the parameters look too much intended.
> + error("Unable to load key file from %s: (%s)",
> + filename, gerr->message);
> + g_clear_error(&gerr);
> + }
> +
> + bdaddr_type = get_le_addr_type(key_file);
> +
> + irk_info = get_irk_info(key_file, entry->d_name, bdaddr_type);
> +
> + if (irk_info) {
> + if (!memcmp(irk_info->val, key, 16)) {
> + DBG("Has same irk,delete it");
Please add a space after the comma, and maybe also print the value.
> + device = btd_adapter_find_device(adapter,
> + &irk_info->bdaddr,
> + irk_info->bdaddr_type);
> + if (device)
> + btd_adapter_remove_device(adapter,
> + device);
> + }
> + }
> + g_key_file_free(key_file);
> + }
> +
> + closedir(dir);
> +
> +}
> +
> static void new_irk_callback(uint16_t index, uint16_t length,
> const void *param, void *user_data)
> {
> @@ -8950,6 +9020,8 @@ static void new_irk_callback(uint16_t index, uint16_t length,
> if (!persistent)
> return;
>
> + delete_exist_irk_from_directory(adapter, irk->val);
exist*ing*?
> +
> store_irk(adapter, &addr->bdaddr, addr->type, irk->val);
>
> btd_device_set_temporary(device, false);
Kind regards,
Paul
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [BlueZ] adapter: Fix execute "LE Add Device To Resolving List" command fail
2024-07-22 7:56 [PATCH] [BlueZ] adapter: Fix execute "LE Add Device To Resolving List" command fail clancy_shang
2024-07-22 8:48 ` Paul Menzel
@ 2024-07-22 9:38 ` bluez.test.bot
2024-07-22 14:57 ` [PATCH] " Luiz Augusto von Dentz
2 siblings, 0 replies; 6+ messages in thread
From: bluez.test.bot @ 2024-07-22 9:38 UTC (permalink / raw)
To: linux-bluetooth, clancy_shang
[-- Attachment #1: Type: text/plain, Size: 34829 bytes --]
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=872864
---Test result---
Test Summary:
CheckPatch PASS 0.45 seconds
GitLint PASS 0.24 seconds
BuildEll PASS 24.35 seconds
BluezMake FAIL 97.17 seconds
MakeCheck FAIL 1962.94 seconds
MakeDistcheck FAIL 116.29 seconds
CheckValgrind FAIL 72.27 seconds
CheckSmatch FAIL 179.32 seconds
bluezmakeextell FAIL 69.19 seconds
IncrementalBuild FAIL 1415.86 seconds
ScanBuild FAIL 721.10 seconds
Details
##############################
Test: BluezMake - FAIL
Desc: Build BlueZ
Output:
tools/mgmt-tester.c: In function ‘main’:
tools/mgmt-tester.c:12725:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
12725 | int main(int argc, char *argv[])
| ^~~~
src/adapter.c: In function ‘delete_exist_irk_from_directory’:
src/adapter.c:8952:17: error: implicit declaration of function ‘get_le_addr_type’; did you mean ‘get_addr_type’? [-Werror=implicit-function-declaration]
8952 | bdaddr_type = get_le_addr_type(key_file);
| ^~~~~~~~~~~~~~~~
| get_addr_type
cc1: all warnings being treated as errors
make[1]: *** [Makefile:11064: src/bluetoothd-adapter.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4674: all] Error 2
##############################
Test: MakeCheck - FAIL
Desc: Run Bluez Make Check
Output:
unit/test-avdtp.c: In function ‘main’:
unit/test-avdtp.c:766:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
766 | int main(int argc, char *argv[])
| ^~~~
unit/test-avrcp.c: In function ‘main’:
unit/test-avrcp.c:989:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
989 | int main(int argc, char *argv[])
| ^~~~
src/adapter.c: In function ‘delete_exist_irk_from_directory’:
src/adapter.c:8952:17: error: implicit declaration of function ‘get_le_addr_type’; did you mean ‘get_addr_type’? [-Werror=implicit-function-declaration]
8952 | bdaddr_type = get_le_addr_type(key_file);
| ^~~~~~~~~~~~~~~~
| get_addr_type
cc1: all warnings being treated as errors
make[1]: *** [Makefile:11064: src/bluetoothd-adapter.o] Error 1
make: *** [Makefile:12303: check] Error 2
##############################
Test: MakeDistcheck - FAIL
Desc: Run Bluez Make Distcheck
Output:
Package cups was not found in the pkg-config search path.
Perhaps you should add the directory containing `cups.pc'
to the PKG_CONFIG_PATH environment variable
No package 'cups' found
../../src/adapter.c: In function ‘delete_exist_irk_from_directory’:
../../src/adapter.c:8952:17: warning: implicit declaration of function ‘get_le_addr_type’; did you mean ‘get_addr_type’? [-Wimplicit-function-declaration]
8952 | bdaddr_type = get_le_addr_type(key_file);
| ^~~~~~~~~~~~~~~~
| get_addr_type
/usr/bin/ld: src/bluetoothd-adapter.o: in function `delete_exist_irk_from_directory':
/github/workspace/src/src/bluez-5.77/_build/sub/../../src/adapter.c:8952: undefined reference to `get_le_addr_type'
collect2: error: ld returned 1 exit status
make[2]: *** [Makefile:6350: src/bluetoothd] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [Makefile:4674: all] Error 2
make: *** [Makefile:12224: distcheck] Error 1
##############################
Test: CheckValgrind - FAIL
Desc: Run Bluez Make Check with Valgrind
Output:
tools/mgmt-tester.c: In function ‘main’:
tools/mgmt-tester.c:12725:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
12725 | int main(int argc, char *argv[])
| ^~~~
src/adapter.c: In function ‘delete_exist_irk_from_directory’:
src/adapter.c:8952:17: error: implicit declaration of function ‘get_le_addr_type’; did you mean ‘get_addr_type’? [-Werror=implicit-function-declaration]
8952 | bdaddr_type = get_le_addr_type(key_file);
| ^~~~~~~~~~~~~~~~
| get_addr_type
cc1: all warnings being treated as errors
make[1]: *** [Makefile:11064: src/bluetoothd-adapter.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:12303: check] Error 2
##############################
Test: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:
src/shared/crypto.c:271:21: warning: Variable length array is used.
src/shared/crypto.c:272:23: warning: Variable length array is used.
src/shared/gatt-helpers.c:768:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:830:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:1323:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:1354:23: warning: Variable length array is used.
src/shared/gatt-server.c:278:25: warning: Variable length array is used.
src/shared/gatt-server.c:618:25: warning: Variable length array is used.
src/shared/gatt-server.c:716:25: warning: Variable length array is used.
src/shared/bap.c:288:25: warning: array of flexible structures
src/shared/bap.c: note: in included file:
./src/shared/ascs.h:88:25: warning: array of flexible structures
src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h):
/usr/include/readline/rltypedefs.h:35:23: warning: non-ANSI function declaration of function 'Function'
/usr/include/readline/rltypedefs.h:36:25: warning: non-ANSI function declaration of function 'VFunction'
/usr/include/readline/rltypedefs.h:37:27: warning: non-ANSI function declaration of function 'CPFunction'
/usr/include/readline/rltypedefs.h:38:29: warning: non-ANSI function declaration of function 'CPPFunction'
src/shared/crypto.c:271:21: warning: Variable length array is used.
src/shared/crypto.c:272:23: warning: Variable length array is used.
src/shared/gatt-helpers.c:768:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:830:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:1323:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:1354:23: warning: Variable length array is used.
src/shared/gatt-server.c:278:25: warning: Variable length array is used.
src/shared/gatt-server.c:618:25: warning: Variable length array is used.
src/shared/gatt-server.c:716:25: warning: Variable length array is used.
src/shared/bap.c:288:25: warning: array of flexible structures
src/shared/bap.c: note: in included file:
./src/shared/ascs.h:88:25: warning: array of flexible structures
src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h):
/usr/include/readline/rltypedefs.h:35:23: warning: non-ANSI function declaration of function 'Function'
/usr/include/readline/rltypedefs.h:36:25: warning: non-ANSI function declaration of function 'VFunction'
/usr/include/readline/rltypedefs.h:37:27: warning: non-ANSI function declaration of function 'CPFunction'
/usr/include/readline/rltypedefs.h:38:29: warning: non-ANSI function declaration of function 'CPPFunction'
tools/mesh-cfgtest.c:1453:17: warning: unknown escape sequence: '\%'
tools/sco-tester.c: note: in included file:
./lib/bluetooth.h:219:15: warning: array of flexible structures
./lib/bluetooth.h:224:31: warning: array of flexible structures
tools/bneptest.c:634:39: warning: unknown escape sequence: '\%'
tools/seq2bseq.c:57:26: warning: Variable length array is used.
tools/obex-client-tool.c: note: in included file (through /usr/include/readline/readline.h):
/usr/include/readline/rltypedefs.h:35:23: warning: non-ANSI function declaration of function 'Function'
/usr/include/readline/rltypedefs.h:36:25: warning: non-ANSI function declaration of function 'VFunction'
/usr/include/readline/rltypedefs.h:37:27: warning: non-ANSI function declaration of function 'CPFunction'
/usr/include/readline/rltypedefs.h:38:29: warning: non-ANSI function declaration of function 'CPPFunction'
android/avctp.c:505:34: warning: Variable length array is used.
android/avctp.c:556:34: warning: Variable length array is used.
unit/test-avrcp.c:373:26: warning: Variable length array is used.
unit/test-avrcp.c:398:26: warning: Variable length array is used.
unit/test-avrcp.c:414:24: warning: Variable length array is used.
android/avrcp-lib.c:1085:34: warning: Variable length array is used.
android/avrcp-lib.c:1583:34: warning: Variable length array is used.
android/avrcp-lib.c:1612:34: warning: Variable length array is used.
android/avrcp-lib.c:1638:34: warning: Variable length array is used.
src/adapter.c: In function ‘delete_exist_irk_from_directory’:
src/adapter.c:8952:17: error: implicit declaration of function ‘get_le_addr_type’; did you mean ‘get_addr_type’? [-Werror=implicit-function-declaration]
8952 | bdaddr_type = get_le_addr_type(key_file);
| ^~~~~~~~~~~~~~~~
| get_addr_type
cc1: all warnings being treated as errors
make[1]: *** [Makefile:11064: src/bluetoothd-adapter.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4674: all] Error 2
##############################
Test: bluezmakeextell - FAIL
Desc: Build Bluez with External ELL
Output:
src/adapter.c: In function ‘delete_exist_irk_from_directory’:
src/adapter.c:8952:17: error: implicit declaration of function ‘get_le_addr_type’; did you mean ‘get_addr_type’? [-Werror=implicit-function-declaration]
8952 | bdaddr_type = get_le_addr_type(key_file);
| ^~~~~~~~~~~~~~~~
| get_addr_type
cc1: all warnings being treated as errors
make[1]: *** [Makefile:11064: src/bluetoothd-adapter.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4674: all] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
[BlueZ] adapter: Fix execute "LE Add Device To Resolving List" command fail
tools/mgmt-tester.c: In function ‘main’:
tools/mgmt-tester.c:12725:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
12725 | int main(int argc, char *argv[])
| ^~~~
unit/test-avdtp.c: In function ‘main’:
unit/test-avdtp.c:766:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
766 | int main(int argc, char *argv[])
| ^~~~
unit/test-avrcp.c: In function ‘main’:
unit/test-avrcp.c:989:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
989 | int main(int argc, char *argv[])
| ^~~~
src/adapter.c: In function ‘delete_exist_irk_from_directory’:
src/adapter.c:8952:17: error: implicit declaration of function ‘get_le_addr_type’; did you mean ‘get_addr_type’? [-Werror=implicit-function-declaration]
8952 | bdaddr_type = get_le_addr_type(key_file);
| ^~~~~~~~~~~~~~~~
| get_addr_type
cc1: all warnings being treated as errors
make[1]: *** [Makefile:11064: src/bluetoothd-adapter.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4674: all] Error 2
##############################
Test: ScanBuild - FAIL
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:1296:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1361:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1636:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1641:2: warning: Use of memory after it is freed
discover_all(op);
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2145:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2153:8: warning: Use of memory after it is freed
discovery_op_ref(op),
^~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3242:2: warning: Use of memory after it is freed
complete_write_long_op(req, success, 0, false);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3264:2: warning: Use of memory after it is freed
request_unref(req);
^~~~~~~~~~~~~~~~~~
12 warnings generated.
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:1296:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1361:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1636:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1641:2: warning: Use of memory after it is freed
discover_all(op);
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2145:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2153:8: warning: Use of memory after it is freed
discovery_op_ref(op),
^~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3242:2: warning: Use of memory after it is freed
complete_write_long_op(req, success, 0, false);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3264:2: warning: Use of memory after it is freed
request_unref(req);
^~~~~~~~~~~~~~~~~~
12 warnings generated.
tools/hciattach.c:816:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 10)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/hciattach.c:864:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 4)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/hciattach.c:886:8: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 10)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/hciattach.c:908:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 4)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/hciattach.c:929:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 4)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/hciattach.c:973:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 6)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
6 warnings generated.
src/oui.c:50:2: warning: Value stored to 'hwdb' is never read
hwdb = udev_hwdb_unref(hwdb);
^ ~~~~~~~~~~~~~~~~~~~~~
src/oui.c:53:2: warning: Value stored to 'udev' is never read
udev = udev_unref(udev);
^ ~~~~~~~~~~~~~~~~
2 warnings generated.
tools/hcidump.c:180:9: warning: Potential leak of memory pointed to by 'dp'
if (fds[i].fd == sock)
^~~
tools/hcidump.c:248:17: warning: Assigned value is garbage or undefined
dh->ts_sec = htobl(frm.ts.tv_sec);
^ ~~~~~~~~~~~~~~~~~~~~
tools/hcidump.c:326:9: warning: 1st function call argument is an uninitialized value
if (be32toh(dp.flags) & 0x02) {
^~~~~~~~~~~~~~~~~
/usr/include/endian.h:46:22: note: expanded from macro 'be32toh'
# define be32toh(x) __bswap_32 (x)
^~~~~~~~~~~~~~
tools/hcidump.c:341:20: warning: 1st function call argument is an uninitialized value
frm.data_len = be32toh(dp.len);
^~~~~~~~~~~~~~~
/usr/include/endian.h:46:22: note: expanded from macro 'be32toh'
# define be32toh(x) __bswap_32 (x)
^~~~~~~~~~~~~~
tools/hcidump.c:346:14: warning: 1st function call argument is an uninitialized value
opcode = be32toh(dp.flags) & 0xffff;
^~~~~~~~~~~~~~~~~
/usr/include/endian.h:46:22: note: expanded from macro 'be32toh'
# define be32toh(x) __bswap_32 (x)
^~~~~~~~~~~~~~
tools/hcidump.c:384:17: warning: Assigned value is garbage or undefined
frm.data_len = btohs(dh.len);
^ ~~~~~~~~~~~~~
tools/hcidump.c:394:11: warning: Assigned value is garbage or undefined
frm.len = frm.data_len;
^ ~~~~~~~~~~~~
tools/hcidump.c:398:9: warning: 1st function call argument is an uninitialized value
ts = be64toh(ph.ts);
^~~~~~~~~~~~~~
/usr/include/endian.h:51:22: note: expanded from macro 'be64toh'
# define be64toh(x) __bswap_64 (x)
^~~~~~~~~~~~~~
tools/hcidump.c:403:13: warning: 1st function call argument is an uninitialized value
frm.in = be32toh(dp.flags) & 0x01;
^~~~~~~~~~~~~~~~~
/usr/include/endian.h:46:22: note: expanded from macro 'be32toh'
# define be32toh(x) __bswap_32 (x)
^~~~~~~~~~~~~~
tools/hcidump.c:408:11: warning: Assigned value is garbage or undefined
frm.in = dh.in;
^ ~~~~~
tools/hcidump.c:437:7: warning: Null pointer passed to 1st parameter expecting 'nonnull'
fd = open(file, open_flags, 0644);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
11 warnings generated.
tools/rfcomm.c:234:3: warning: Value stored to 'i' is never read
i = execvp(cmdargv[0], cmdargv);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/rfcomm.c:234:7: warning: Null pointer passed to 1st parameter expecting 'nonnull'
i = execvp(cmdargv[0], cmdargv);
^~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/rfcomm.c:354:8: warning: Although the value stored to 'fd' is used in the enclosing expression, the value is never actually read from 'fd'
if ((fd = open(devname, O_RDONLY | O_NOCTTY)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/rfcomm.c:497:14: warning: Assigned value is garbage or undefined
req.channel = raddr.rc_channel;
^ ~~~~~~~~~~~~~~~~
tools/rfcomm.c:515:8: warning: Although the value stored to 'fd' is used in the enclosing expression, the value is never actually read from 'fd'
if ((fd = open(devname, O_RDONLY | O_NOCTTY)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5 warnings generated.
src/sdp-xml.c:126:10: warning: Assigned value is garbage or undefined
buf[1] = data[i + 1];
^ ~~~~~~~~~~~
src/sdp-xml.c:300:11: warning: Assigned value is garbage or undefined
buf[1] = data[i + 1];
^ ~~~~~~~~~~~
src/sdp-xml.c:338:11: warning: Assigned value is garbage or undefined
buf[1] = data[i + 1];
^ ~~~~~~~~~~~
3 warnings generated.
tools/ciptool.c:350:7: warning: 5th function call argument is an uninitialized value
sk = do_connect(ctl, dev_id, &src, &dst, psm, (1 << CMTP_LOOPBACK));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
tools/sdptool.c:941:26: warning: Result of 'malloc' is converted to a pointer of type 'uint32_t', which is incompatible with sizeof operand type 'int'
uint32_t *value_int = malloc(sizeof(int));
~~~~~~~~~~ ^~~~~~ ~~~~~~~~~~~
tools/sdptool.c:980:4: warning: 1st function call argument is an uninitialized value
free(allocArray[i]);
^~~~~~~~~~~~~~~~~~~
tools/sdptool.c:3777:2: warning: Potential leak of memory pointed to by 'si.name'
return add_service(0, &si);
^~~~~~~~~~~~~~~~~~~~~~~~~~
tools/sdptool.c:4112:4: warning: Potential leak of memory pointed to by 'context.svc'
return -1;
^~~~~~~~~
4 warnings generated.
tools/avtest.c:225:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:235:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 4);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:244:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:258:5: warning: Value stored to 'len' is never read
len = write(sk, buf,
^ ~~~~~~~~~~~~~~
tools/avtest.c:265:5: warning: Value stored to 'len' is never read
len = write(sk, buf,
^ ~~~~~~~~~~~~~~
tools/avtest.c:272:5: warning: Value stored to 'len' is never read
len = write(sk, buf,
^ ~~~~~~~~~~~~~~
tools/avtest.c:279:5: warning: Value stored to 'len' is never read
len = write(sk, buf,
^ ~~~~~~~~~~~~~~
tools/avtest.c:291:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 4);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:295:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:304:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:308:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:317:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:324:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:346:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 4);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:350:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:359:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:363:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:376:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 4);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:380:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:387:4: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:397:4: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:562:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:570:3: warning: Value stored to 'len' is never read
len = write(sk, buf, invalid ? 2 : 3);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/avtest.c:584:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 4 + sizeof(media_transport));
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/avtest.c:597:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:607:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:619:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:634:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:646:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:655:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:662:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:698:2: warning: Value stored to 'len' is never read
len = write(sk, buf, AVCTP_HEADER_LENGTH + sizeof(play_pressed));
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
32 warnings generated.
tools/btproxy.c:836:15: warning: Null pointer passed to 1st parameter expecting 'nonnull'
tcp_port = atoi(optarg);
^~~~~~~~~~~~
tools/btproxy.c:839:8: warning: Null pointer passed to 1st parameter expecting 'nonnull'
if (strlen(optarg) > 3 && !strncmp(optarg, "hci", 3))
^~~~~~~~~~~~~~
2 warnings generated.
tools/create-image.c:76:3: warning: Value stored to 'fd' is never read
fd = -1;
^ ~~
tools/create-image.c:84:3: warning: Value stored to 'fd' is never read
fd = -1;
^ ~~
tools/create-image.c:92:3: warning: Value stored to 'fd' is never read
fd = -1;
^ ~~
tools/create-image.c:105:2: warning: Value stored to 'fd' is never read
fd = -1;
^ ~~
4 warnings generated.
tools/btgatt-client.c:1824:2: warning: Value stored to 'argv' is never read
argv += optind;
^ ~~~~~~
1 warning generated.
tools/btgatt-server.c:1212:2: warning: Value stored to 'argv' is never read
argv -= optind;
^ ~~~~~~
1 warning generated.
tools/check-selftest.c:42:3: warning: Value stored to 'ptr' is never read
ptr = fgets(result, sizeof(result), fp);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
tools/gatt-service.c:294:2: warning: 2nd function call argument is an uninitialized value
chr_write(chr, value, len);
^~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
tools/obex-server-tool.c:133:13: warning: Null pointer passed to 1st parameter expecting 'nonnull'
data->fd = open(name, O_WRONLY | O_CREAT | O_NOCTTY, 0600);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/obex-server-tool.c:192:13: warning: Null pointer passed to 1st parameter expecting 'nonnull'
data->fd = open(name, O_RDONLY | O_NOCTTY, 0);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 warnings generated.
tools/btpclientctl.c:402:3: warning: Value stored to 'bit' is never read
bit = 0;
^ ~
tools/btpclientctl.c:1655:2: warning: Null pointer passed to 2nd parameter expecting 'nonnull'
memcpy(cp->data, ad_data, ad_len);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 warnings generated.
src/sdpd-request.c:211:13: warning: Result of 'malloc' is converted to a pointer of type 'char', which is incompatible with sizeof operand type 'uint16_t'
pElem = malloc(sizeof(uint16_t));
^~~~~~ ~~~~~~~~~~~~~~~~
src/sdpd-request.c:239:13: warning: Result of 'malloc' is converted to a pointer of type 'char', which is incompatible with sizeof operand type 'uint32_t'
pElem = malloc(sizeof(uint32_t));
^~~~~~ ~~~~~~~~~~~~~~~~
2 warnings generated.
android/avrcp-lib.c:1968:3: warning: 1st function call argument is an uninitialized value
g_free(text[i]);
^~~~~~~~~~~~~~~
1 warning generated.
profiles/health/hdp.c:644:3: warning: Use of memory after it is freed
hdp_tmp_dc_data_unref(dc_data);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
profiles/health/hdp.c:800:19: warning: Use of memory after it is freed
path = g_strdup(chan->path);
^~~~~~~~~~
profiles/health/hdp.c:1779:6: warning: Use of memory after it is freed
hdp_tmp_dc_data_ref(hdp_conn),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
profiles/health/hdp.c:1836:30: warning: Use of memory after it is freed
reply = g_dbus_create_error(data->msg, ERROR_INTERFACE ".HealthError",
^~~~~~~~~
4 warnings generated.
profiles/health/hdp_util.c:1052:2: warning: Use of memory after it is freed
conn_data->func(conn_data->data, gerr);
^~~~~~~~~~~~~~~
1 warning generated.
attrib/gatt.c:970:2: warning: Potential leak of memory pointed to by 'long_write'
return prepare_write(long_write);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
src/sdpd-request.c:211:13: warning: Result of 'malloc' is converted to a pointer of type 'char', which is incompatible with sizeof operand type 'uint16_t'
pElem = malloc(sizeof(uint16_t));
^~~~~~ ~~~~~~~~~~~~~~~~
src/sdpd-request.c:239:13: warning: Result of 'malloc' is converted to a pointer of type 'char', which is incompatible with sizeof operand type 'uint32_t'
pElem = malloc(sizeof(uint32_t));
^~~~~~ ~~~~~~~~~~~~~~~~
2 warnings generated.
src/sdp-xml.c:126:10: warning: Assigned value is garbage or undefined
buf[1] = data[i + 1];
^ ~~~~~~~~~~~
src/sdp-xml.c:300:11: warning: Assigned value is garbage or undefined
buf[1] = data[i + 1];
^ ~~~~~~~~~~~
src/sdp-xml.c:338:11: warning: Assigned value is garbage or undefined
buf[1] = data[i + 1];
^ ~~~~~~~~~~~
3 warnings generated.
src/sdp-client.c:353:14: warning: Access to field 'cb' results in a dereference of a null pointer
(*ctxt)->cb = cb;
~~~~~~~~~~~~^~~~
1 warning generated.
src/gatt-database.c:1155:10: warning: Value stored to 'bits' during its initialization is never read
uint8_t bits[] = { BT_GATT_CHRC_CLI_FEAT_ROBUST_CACHING,
^~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
src/adapter.c: In function ‘delete_exist_irk_from_directory’:
src/adapter.c:8952:17: error: implicit declaration of function ‘get_le_addr_type’; did you mean ‘get_addr_type’? [-Werror=implicit-function-declaration]
8952 | bdaddr_type = get_le_addr_type(key_file);
| ^~~~~~~~~~~~~~~~
| get_addr_type
cc1: all warnings being treated as errors
make[1]: *** [Makefile:11064: src/bluetoothd-adapter.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4674: all] Error 2
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] [BlueZ] adapter: Fix execute "LE Add Device To Resolving List" command fail
2024-07-22 7:56 [PATCH] [BlueZ] adapter: Fix execute "LE Add Device To Resolving List" command fail clancy_shang
2024-07-22 8:48 ` Paul Menzel
2024-07-22 9:38 ` bluez.test.bot
@ 2024-07-22 14:57 ` Luiz Augusto von Dentz
[not found] ` <1c525ed7.13cb.190dd367dda.Coremail.clancy_shang@163.com>
2 siblings, 1 reply; 6+ messages in thread
From: Luiz Augusto von Dentz @ 2024-07-22 14:57 UTC (permalink / raw)
To: clancy_shang; +Cc: linux-bluetooth, Clancy Shang
Hi,
On Mon, Jul 22, 2024 at 3:56 AM <clancy_shang@163.com> wrote:
>
> From: Clancy Shang <clancy.shang@quectel.com>
>
> According to BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 4, Part E,
> 7.8.38, If there is an existing entry in the resolving list with the same
> non-zero Peer_IRK, the Controller should return the error code Invalid
> HCI Command Parameters (0x12), so fix it.
>
> Signed-off-by: Clancy Shang <clancy.shang@quectel.com>
Ok, what is really going on? Why is the IRK left behind? Or are there
2 distinct devices with the same IRK? Perhaps the better fix would be
the kernel to detect if there is already the same IRK just ignore it,
since for the purpose of resolving the address that should work, that
said we should have detected if the device has the same IRK then it
shall have the same identity address so something doesn't add up here.
> ---
> src/adapter.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 72 insertions(+)
>
> diff --git a/src/adapter.c b/src/adapter.c
> index 85ddfc165..495c9f631 100644
> --- a/src/adapter.c
> +++ b/src/adapter.c
> @@ -8901,6 +8901,76 @@ static void store_irk(struct btd_adapter *adapter, const bdaddr_t *peer,
> g_key_file_free(key_file);
> }
>
> +static void delete_exist_irk_from_directory(
> + struct btd_adapter *adapter,
> + const unsigned char *key)
> +{
> + char dirname[PATH_MAX];
> + GError *gerr = NULL;
> + DIR *dir;
> + struct dirent *entry;
> +
> + create_filename(dirname, PATH_MAX, "/%s",
> + btd_adapter_get_storage_dir(adapter));
> +
> + dir = opendir(dirname);
> + if (!dir) {
> + btd_error(adapter->dev_id,
> + "Unable to open adapter storage directory: %s",
> + dirname);
> + return;
> + }
> +
> + while ((entry = readdir(dir)) != NULL) {
> + struct btd_device *device;
> + char filename[PATH_MAX];
> + GKeyFile *key_file;
> + struct irk_info *irk_info;
> + uint8_t bdaddr_type;
> +
> + if (entry->d_type == DT_UNKNOWN)
> + entry->d_type = util_get_dt(dirname, entry->d_name);
> +
> + if (entry->d_type != DT_DIR || bachk(entry->d_name) < 0)
> + continue;
> +
> + create_filename(filename, PATH_MAX, "/%s/%s/info",
> + btd_adapter_get_storage_dir(adapter),
> + entry->d_name);
> +
> + key_file = g_key_file_new();
> + if (!g_key_file_load_from_file(
> + key_file,
> + filename,
> + 0,
> + &gerr)) {
> + error("Unable to load key file from %s: (%s)",
> + filename, gerr->message);
> + g_clear_error(&gerr);
> + }
> +
> + bdaddr_type = get_le_addr_type(key_file);
> +
> + irk_info = get_irk_info(key_file, entry->d_name, bdaddr_type);
> +
> + if (irk_info) {
> + if (!memcmp(irk_info->val, key, 16)) {
> + DBG("Has same irk,delete it");
> + device = btd_adapter_find_device(adapter,
> + &irk_info->bdaddr,
> + irk_info->bdaddr_type);
> + if (device)
> + btd_adapter_remove_device(adapter,
> + device);
> + }
> + }
> + g_key_file_free(key_file);
> + }
> +
> + closedir(dir);
> +
> +}
> +
> static void new_irk_callback(uint16_t index, uint16_t length,
> const void *param, void *user_data)
> {
> @@ -8950,6 +9020,8 @@ static void new_irk_callback(uint16_t index, uint16_t length,
> if (!persistent)
> return;
>
> + delete_exist_irk_from_directory(adapter, irk->val);
> +
> store_irk(adapter, &addr->bdaddr, addr->type, irk->val);
>
> btd_device_set_temporary(device, false);
> --
> 2.25.1
>
>
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Re: [PATCH] [BlueZ] adapter: Fix execute "LE Add Device To Resolving List" command fail
[not found] ` <1c525ed7.13cb.190dd367dda.Coremail.clancy_shang@163.com>
@ 2024-07-23 2:55 ` Luiz Augusto von Dentz
2024-07-23 3:07 ` clancy_shang
0 siblings, 1 reply; 6+ messages in thread
From: Luiz Augusto von Dentz @ 2024-07-23 2:55 UTC (permalink / raw)
To: clancy_shang; +Cc: linux-bluetooth, Clancy Shang
Hi,
On Mon, Jul 22, 2024 at 9:31 PM clancy_shang <clancy_shang@163.com> wrote:
>
> Hi,
>
>
> I have replied the test steps in another email. the device are the same deviece which different is the privace statitc address .
>
> details as follows:
>
>
>
>
Ok, how about collecting the HCI with btmon so we can actually check
other traces as well, from the looks of it this sounds like a kernel
issue though, where it is attempting to program an IRK already in the
list.
> At 2024-07-22 22:57:18, "Luiz Augusto von Dentz" <luiz.dentz@gmail.com> wrote:
> >Hi,
> >
> >On Mon, Jul 22, 2024 at 3:56 AM <clancy_shang@163.com> wrote:
> >>
> >> From: Clancy Shang <clancy.shang@quectel.com>
> >>
> >> According to BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 4, Part E,
> >> 7.8.38, If there is an existing entry in the resolving list with the same
> >> non-zero Peer_IRK, the Controller should return the error code Invalid
> >> HCI Command Parameters (0x12), so fix it.
> >>
> >> Signed-off-by: Clancy Shang <clancy.shang@quectel.com>
> >
> >Ok, what is really going on? Why is the IRK left behind? Or are there
> >2 distinct devices with the same IRK? Perhaps the better fix would be
> >the kernel to detect if there is already the same IRK just ignore it,
> >since for the purpose of resolving the address that should work, that
> >said we should have detected if the device has the same IRK then it
> >shall have the same identity address so something doesn't add up here.
> >
> >> ---
> >> src/adapter.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++
> >> 1 file changed, 72 insertions(+)
> >>
> >> diff --git a/src/adapter.c b/src/adapter.c
> >> index 85ddfc165..495c9f631 100644
> >> --- a/src/adapter.c
> >> +++ b/src/adapter.c
> >> @@ -8901,6 +8901,76 @@ static void store_irk(struct btd_adapter *adapter, const bdaddr_t *peer,
> >> g_key_file_free(key_file);
> >> }
> >>
> >> +static void delete_exist_irk_from_directory(
> >> + struct btd_adapter *adapter,
> >> + const unsigned char *key)
> >> +{
> >> + char dirname[PATH_MAX];
> >> + GError *gerr = NULL;
> >> + DIR *dir;
> >> + struct dirent *entry;
> >> +
> >> + create_filename(dirname, PATH_MAX, "/%s",
> >> + btd_adapter_get_storage_dir(adapter));
> >> +
> >> + dir = opendir(dirname);
> >> + if (!dir) {
> >> + btd_error(adapter->dev_id,
> >> + "Unable to open adapter storage directory: %s",
> >> + dirname);
> >> + return;
> >> + }
> >> +
> >> + while ((entry = readdir(dir)) != NULL) {
> >> + struct btd_device *device;
> >> + char filename[PATH_MAX];
> >> + GKeyFile *key_file;
> >> + struct irk_info *irk_info;
> >> + uint8_t bdaddr_type;
> >> +
> >> + if (entry->d_type == DT_UNKNOWN)
> >> + entry->d_type = util_get_dt(dirname, entry->d_name);
> >> +
> >> + if (entry->d_type != DT_DIR || bachk(entry->d_name) < 0)
> >> + continue;
> >> +
> >> + create_filename(filename, PATH_MAX, "/%s/%s/info",
> >> + btd_adapter_get_storage_dir(adapter),
> >> + entry->d_name);
> >> +
> >> + key_file = g_key_file_new();
> >> + if (!g_key_file_load_from_file(
> >> + key_file,
> >> + filename,
> >> + 0,
> >> + &gerr)) {
> >> + error("Unable to load key file from %s: (%s)",
> >> + filename, gerr->message);
> >> + g_clear_error(&gerr);
> >> + }
> >> +
> >> + bdaddr_type = get_le_addr_type(key_file);
> >> +
> >> + irk_info = get_irk_info(key_file, entry->d_name, bdaddr_type);
> >> +
> >> + if (irk_info) {
> >> + if (!memcmp(irk_info->val, key, 16)) {
> >> + DBG("Has same irk,delete it");
> >> + device = btd_adapter_find_device(adapter,
> >> + &irk_info->bdaddr,
> >> + irk_info->bdaddr_type);
> >> + if (device)
> >> + btd_adapter_remove_device(adapter,
> >> + device);
> >> + }
> >> + }
> >> + g_key_file_free(key_file);
> >> + }
> >> +
> >> + closedir(dir);
> >> +
> >> +}
> >> +
> >> static void new_irk_callback(uint16_t index, uint16_t length,
> >> const void *param, void *user_data)
> >> {
> >> @@ -8950,6 +9020,8 @@ static void new_irk_callback(uint16_t index, uint16_t length,
> >> if (!persistent)
> >> return;
> >>
> >> + delete_exist_irk_from_directory(adapter, irk->val);
> >> +
> >> store_irk(adapter, &addr->bdaddr, addr->type, irk->val);
> >>
> >> btd_device_set_temporary(device, false);
> >> --
> >> 2.25.1
> >>
> >>
> >
> >
> >--
> >Luiz Augusto von Dentz
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re:Re: Re: [PATCH] [BlueZ] adapter: Fix execute "LE Add Device To Resolving List" command fail
2024-07-23 2:55 ` Luiz Augusto von Dentz
@ 2024-07-23 3:07 ` clancy_shang
0 siblings, 0 replies; 6+ messages in thread
From: clancy_shang @ 2024-07-23 3:07 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth, Clancy Shang
[-- Attachment #1.1: Type: text/plain, Size: 6047 bytes --]
Hi,I uploaded the attachment which should be opened by Ellisys Bluetooth Analyzer software.
At 2024-07-23 10:55:04, "Luiz Augusto von Dentz" <luiz.dentz@gmail.com> wrote:
>Hi,
>
>On Mon, Jul 22, 2024 at 9:31 PM clancy_shang <clancy_shang@163.com> wrote:
>>
>> Hi,
>>
>>
>> I have replied the test steps in another email. the device are the same deviece which different is the privace statitc address .
>>
>> details as follows:
>>
>>
>>
>>
>
>Ok, how about collecting the HCI with btmon so we can actually check
>other traces as well, from the looks of it this sounds like a kernel
>issue though, where it is attempting to program an IRK already in the
>list.
>
>> At 2024-07-22 22:57:18, "Luiz Augusto von Dentz" <luiz.dentz@gmail.com> wrote:
>> >Hi,
>> >
>> >On Mon, Jul 22, 2024 at 3:56 AM <clancy_shang@163.com> wrote:
>> >>
>> >> From: Clancy Shang <clancy.shang@quectel.com>
>> >>
>> >> According to BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 4, Part E,
>> >> 7.8.38, If there is an existing entry in the resolving list with the same
>> >> non-zero Peer_IRK, the Controller should return the error code Invalid
>> >> HCI Command Parameters (0x12), so fix it.
>> >>
>> >> Signed-off-by: Clancy Shang <clancy.shang@quectel.com>
>> >
>> >Ok, what is really going on? Why is the IRK left behind? Or are there
>> >2 distinct devices with the same IRK? Perhaps the better fix would be
>> >the kernel to detect if there is already the same IRK just ignore it,
>> >since for the purpose of resolving the address that should work, that
>> >said we should have detected if the device has the same IRK then it
>> >shall have the same identity address so something doesn't add up here.
>> >
>> >> ---
>> >> src/adapter.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++
>> >> 1 file changed, 72 insertions(+)
>> >>
>> >> diff --git a/src/adapter.c b/src/adapter.c
>> >> index 85ddfc165..495c9f631 100644
>> >> --- a/src/adapter.c
>> >> +++ b/src/adapter.c
>> >> @@ -8901,6 +8901,76 @@ static void store_irk(struct btd_adapter *adapter, const bdaddr_t *peer,
>> >> g_key_file_free(key_file);
>> >> }
>> >>
>> >> +static void delete_exist_irk_from_directory(
>> >> + struct btd_adapter *adapter,
>> >> + const unsigned char *key)
>> >> +{
>> >> + char dirname[PATH_MAX];
>> >> + GError *gerr = NULL;
>> >> + DIR *dir;
>> >> + struct dirent *entry;
>> >> +
>> >> + create_filename(dirname, PATH_MAX, "/%s",
>> >> + btd_adapter_get_storage_dir(adapter));
>> >> +
>> >> + dir = opendir(dirname);
>> >> + if (!dir) {
>> >> + btd_error(adapter->dev_id,
>> >> + "Unable to open adapter storage directory: %s",
>> >> + dirname);
>> >> + return;
>> >> + }
>> >> +
>> >> + while ((entry = readdir(dir)) != NULL) {
>> >> + struct btd_device *device;
>> >> + char filename[PATH_MAX];
>> >> + GKeyFile *key_file;
>> >> + struct irk_info *irk_info;
>> >> + uint8_t bdaddr_type;
>> >> +
>> >> + if (entry->d_type == DT_UNKNOWN)
>> >> + entry->d_type = util_get_dt(dirname, entry->d_name);
>> >> +
>> >> + if (entry->d_type != DT_DIR || bachk(entry->d_name) < 0)
>> >> + continue;
>> >> +
>> >> + create_filename(filename, PATH_MAX, "/%s/%s/info",
>> >> + btd_adapter_get_storage_dir(adapter),
>> >> + entry->d_name);
>> >> +
>> >> + key_file = g_key_file_new();
>> >> + if (!g_key_file_load_from_file(
>> >> + key_file,
>> >> + filename,
>> >> + 0,
>> >> + &gerr)) {
>> >> + error("Unable to load key file from %s: (%s)",
>> >> + filename, gerr->message);
>> >> + g_clear_error(&gerr);
>> >> + }
>> >> +
>> >> + bdaddr_type = get_le_addr_type(key_file);
>> >> +
>> >> + irk_info = get_irk_info(key_file, entry->d_name, bdaddr_type);
>> >> +
>> >> + if (irk_info) {
>> >> + if (!memcmp(irk_info->val, key, 16)) {
>> >> + DBG("Has same irk,delete it");
>> >> + device = btd_adapter_find_device(adapter,
>> >> + &irk_info->bdaddr,
>> >> + irk_info->bdaddr_type);
>> >> + if (device)
>> >> + btd_adapter_remove_device(adapter,
>> >> + device);
>> >> + }
>> >> + }
>> >> + g_key_file_free(key_file);
>> >> + }
>> >> +
>> >> + closedir(dir);
>> >> +
>> >> +}
>> >> +
>> >> static void new_irk_callback(uint16_t index, uint16_t length,
>> >> const void *param, void *user_data)
>> >> {
>> >> @@ -8950,6 +9020,8 @@ static void new_irk_callback(uint16_t index, uint16_t length,
>> >> if (!persistent)
>> >> return;
>> >>
>> >> + delete_exist_irk_from_directory(adapter, irk->val);
>> >> +
>> >> store_irk(adapter, &addr->bdaddr, addr->type, irk->val);
>> >>
>> >> btd_device_set_temporary(device, false);
>> >> --
>> >> 2.25.1
>> >>
>> >>
>> >
>> >
>> >--
>> >Luiz Augusto von Dentz
>
>
>
>--
>Luiz Augusto von Dentz
[-- Attachment #1.2: Type: text/html, Size: 8062 bytes --]
[-- Attachment #2: add_Resolving_list_fail.btt --]
[-- Type: application/octet-stream, Size: 1108929 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-07-23 3:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-22 7:56 [PATCH] [BlueZ] adapter: Fix execute "LE Add Device To Resolving List" command fail clancy_shang
2024-07-22 8:48 ` Paul Menzel
2024-07-22 9:38 ` bluez.test.bot
2024-07-22 14:57 ` [PATCH] " Luiz Augusto von Dentz
[not found] ` <1c525ed7.13cb.190dd367dda.Coremail.clancy_shang@163.com>
2024-07-23 2:55 ` Luiz Augusto von Dentz
2024-07-23 3:07 ` clancy_shang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).