From 477c17c9d164ea056d9e32e215b8d54d757c9374 Mon Sep 17 00:00:00 2001 From: Hui Peng Date: Sat, 2 Sep 2023 04:27:29 +0000 Subject: [PATCH] Reject access to secure services authenticated from temp bonding [2] Reject access to service running on rfcomm this is a backport of I10fcc2dcd78fc22ffbe3c425669fc9889b94a166 Bug: 294854926 Test: m com.android.btservices Ignore-AOSP-First: security (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5e0e907ec4948f06b3a35ecf08725c020d533ccb) Merged-In: I10fcc2dcd78fc22ffbe3c425669fc9889b94a166 Change-Id: I10fcc2dcd78fc22ffbe3c425669fc9889b94a166 --- stack/btm/btm_sec.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stack/btm/btm_sec.c b/stack/btm/btm_sec.c index 23b334ce27..21af82f8eb 100644 --- a/stack/btm/btm_sec.c +++ b/stack/btm/btm_sec.c @@ -2648,8 +2648,13 @@ tBTM_STATUS btm_sec_mx_access_request (BD_ADDR bd_addr, UINT16 psm, BOOLEAN is_o } else /* rc == BTM_SUCCESS */ { + if (access_secure_service_from_temp_bond(p_dev_rec, + is_originator, security_required)) { + LOG_ERROR(LOG_TAG, "Trying to access a secure rfcomm service from a temp bonding, reject"); + rc = BTM_FAILED_ON_SECURITY; + } /* access granted */ - if (p_callback) + if (p_callback) { (*p_callback) (bd_addr, transport, p_ref_data, (UINT8)rc); }