From 48235c7b2501066646468b335a4aff72b5d08b3e Mon Sep 17 00:00:00 2001 From: zhanghaipeng Date: Tue, 8 Jul 2025 17:12:30 +0800 Subject: [PATCH] fix(ble/bluedroid): Fix issue causing BTM_GetSecurityFlags failed --- components/bt/host/bluedroid/stack/btm/btm_dev.c | 1 + components/bt/host/bluedroid/stack/btm/btm_sec.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/components/bt/host/bluedroid/stack/btm/btm_dev.c b/components/bt/host/bluedroid/stack/btm/btm_dev.c index f705a8dc69..c4eb88a004 100644 --- a/components/bt/host/bluedroid/stack/btm/btm_dev.c +++ b/components/bt/host/bluedroid/stack/btm/btm_dev.c @@ -675,6 +675,7 @@ tBTM_SEC_DEV_REC *btm_find_oldest_dev (void) /* All devices are paired; find the oldest */ for (p_node = list_begin(btm_cb.p_sec_dev_rec_list); p_node; p_node = list_next(p_node)) { + p_dev_rec = list_node(p_node); if ((p_dev_rec->sec_flags & BTM_SEC_IN_USE) == 0) { continue; } diff --git a/components/bt/host/bluedroid/stack/btm/btm_sec.c b/components/bt/host/bluedroid/stack/btm/btm_sec.c index 3ed5d4b13f..ab66eb4214 100644 --- a/components/bt/host/bluedroid/stack/btm/btm_sec.c +++ b/components/bt/host/bluedroid/stack/btm/btm_sec.c @@ -342,7 +342,12 @@ BOOLEAN BTM_GetSecurityFlags (BD_ADDR bd_addr, UINT8 *p_sec_flags) *p_sec_flags = (UINT8) p_dev_rec->sec_flags; return (TRUE); } - BTM_TRACE_ERROR ("BTM_GetSecurityFlags false"); + + BTM_TRACE_ERROR("%s: BTM_GetSecurityFlags failed for device [%02X:%02X:%02X:%02X:%02X:%02X]", + __func__, + bd_addr[0], bd_addr[1], bd_addr[2], + bd_addr[3], bd_addr[4], bd_addr[5]); + return (FALSE); } @@ -369,7 +374,12 @@ BOOLEAN BTM_GetSecurityFlagsByTransport (BD_ADDR bd_addr, UINT8 *p_sec_flags, return (TRUE); } - BTM_TRACE_ERROR ("BTM_GetSecurityFlags false\n"); + + BTM_TRACE_ERROR("%s: BTM_GetSecurityFlags failed for device [%02X:%02X:%02X:%02X:%02X:%02X]", + __func__, + bd_addr[0], bd_addr[1], bd_addr[2], + bd_addr[3], bd_addr[4], bd_addr[5]); + return (FALSE); }