aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHui Peng <phui@google.com>2024-01-09 22:38:20 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-01-11 04:47:15 +0000
commit55fe7f05819ff1ef946bdec429b64e72cea834cc (patch)
tree784228e7c6a92c4aeb08973a396e2cc5b278851b
parenta3f668028463a637d28bca1c2d439f4ca1ee326d (diff)
downloadbt-55fe7f05819ff1ef946bdec429b64e72cea834cc.tar.gz
Fix a security bypass issue in access_secure_service_from_temp_bond
Backport I48df2c2d77810077e97d4131540277273d441998 to rvc-dev Bug: 318374503 Test: m com.android.btservices | manual test against PoC | QA Ignore-AOSP-First: security (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e908c16d9157b9e4a936117f06b8f964cf8386b8) Merged-In: Ib7cf66019b3d45a2a23d235ad5f9dc406394456f Change-Id: Ib7cf66019b3d45a2a23d235ad5f9dc406394456f
-rw-r--r--stack/btm/btm_sec.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
index bfb045c5a..e53a91497 100644
--- a/stack/btm/btm_sec.cc
+++ b/stack/btm/btm_sec.cc
@@ -218,8 +218,7 @@ static bool access_secure_service_from_temp_bond(const tBTM_SEC_DEV_REC* p_dev_r
bool locally_initiated,
uint16_t security_req) {
return !locally_initiated && (security_req & BTM_SEC_IN_AUTHENTICATE) &&
- btm_dev_authenticated(p_dev_rec) &&
- p_dev_rec->is_bond_type_temporary();
+ p_dev_rec->is_bond_type_temporary();
}
/*******************************************************************************