From patchwork Wed Jul 31 01:57:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: clancy_shang X-Patchwork-Id: 13748003 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.3]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0BAF4D512 for ; Wed, 31 Jul 2024 01:58:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.3 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722391087; cv=none; b=hXkfbYKcqtW7KQpkVIIdk3VGeCw75MnKPjS/GJzhAQxfyB4OFGdZ0qinor9JbKR2amoHWfRnwtnvpO6B+l6SmdbBfORjC/u0UXGfAVJMy0crQVHRBr6hy97g4ypjOtE4zFHRqWPWCyFtvE0vYZar2GSNHcGC7SRjGWFOpoWB5yI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722391087; c=relaxed/simple; bh=2nAMuMh3EbNR9DPdc4WzFWCJUU1zWyjtJ6amfdRaIWo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=gjWsczBqPolO4XfpqPiGq7NKLYNOKpxMFqFwlkfDE+HGSkmo6jXa4LK5ALvTpSf2U+OnST+mEaLY2zRUjA8JQyTmbY23VHx0mpg/sYKJFntTAJpHvVRF5kh1idyYa3jNGCPEMYvhESjskZHH6LglmTb6vWxjEH+TxM0rrHrKAMQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=U7FVMi2q; arc=none smtp.client-ip=117.135.210.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="U7FVMi2q" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=ZEboa k9Mqf5fpJ22TodzC7PSIXjOJDx19Z+9o0bWbpM=; b=U7FVMi2q6FmPSpUYO4oVx KuzgATb3g7DdiqEL+HYiBfwNL5D1hqta8EV7bs5hmvUyfQQfRlmirdjKIZxbUqD+ HP199/ZdkLgTD5SBzI9jm5n4WembMd/5E/RZJhcm3QdeoBN674f1aYonyro5l5bm de2CAEAISTK/lrRJuoa4Ww= Received: from WH-D-007635B.QUECTEL.COM (unknown [223.76.229.213]) by gzga-smtp-mta-g1-1 (Coremail) with SMTP id _____wD3n1AemqlmKy1FBw--.9883S2; Wed, 31 Jul 2024 09:57:51 +0800 (CST) From: clancy_shang@163.com To: linux-bluetooth@vger.kernel.org Cc: zhongjun.yu@quectel.com, Clancy Shang Subject: [PATCH] [BlueZ] adapter: Fix execute "LE Add Device To Resolving List" command fail Date: Wed, 31 Jul 2024 09:57:47 +0800 Message-Id: <20240731015747.788949-1-clancy_shang@163.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: _____wD3n1AemqlmKy1FBw--.9883S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxCF48tF4DWF45tF47uF4Uurg_yoW5try7pr Z8JF90qws5tr1xKr4fuF4xWry5ur4kJ34rKFZ3W3srKF17WFWUXFWSkryfta4xGwn5W3ZI van0qa4DGa1UGF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07U8sqZUUUUU= X-CM-SenderInfo: xfod0ux1bvxtlqj6il2tof0z/1tbiUAItuGXAmM89wwAAsL From: Clancy Shang 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. Test environment: I tested with the game controller device, and the steps are as follows: 1. The game controller device enters advertising pairing mode and then connects. 2. Disconnect. 3. Make the hand shank enter advertising pairing mode again and then reconnect. 4. Reproduce. The step one and step four, the game controller device is the same device but with a different privacy static address, causing the same IRK. There could be some trouble if it is fixed in the kernel. Firstly, there would be two devices in the paired list, but only the latest device can be conneted. Actually they are the same device. Secondly, the display will show two devices too. Signed-off-by: Clancy Shang --- src/adapter.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/src/adapter.c b/src/adapter.c index 85ddfc165..d2f09cc2c 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -8901,6 +8901,73 @@ static void store_irk(struct btd_adapter *adapter, const bdaddr_t *peer, g_key_file_free(key_file); } +static void delete_existing_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 +9017,8 @@ static void new_irk_callback(uint16_t index, uint16_t length, if (!persistent) return; + delete_existing_irk_from_directory(adapter, irk->val); + store_irk(adapter, &addr->bdaddr, addr->type, irk->val); btd_device_set_temporary(device, false);