commit 71ecd2ebe5ebddcd6db0b5fdc44e3d9eaef17f2f
author li-wei.cheng <li-wei.cheng@mediatek.com> Mon Jan 20 15:27:21 2020 +0800
committer android-build-team Robot <android-build-team-robot@google.com> Wed Sep 30 00:06:53 2020 +0000
tree bd929929220b9161518c705feb8ea4d44bf9756b
parent ef1f6c676ef51da9720c84e4c06d07e60b727d52

Return after removing sample LTK device

Return directly after calling bta_dm_remove_device to
prevent from accessing the invalid security record (p_dev_rec).

Test: Hardcode to test bond with sample key
Tag: #security
Bug: 162497143
Change-Id: Iaa59f3c415dd8066849fd70912fdb83f890229d7
(cherry picked from commit 7c86810c44ef2efd97c3e78bd77e36257a05f75b)

stack/btm/btm_sec.cc

diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
index 63e4f6c..5d7d0f9 100644
--- a/stack/btm/btm_sec.cc
+++ b/stack/btm/btm_sec.cc
@@ -4358,6 +4358,7 @@
               << p_dev_rec->bd_addr;
 
     bta_dm_remove_device(p_dev_rec->bd_addr);
+    return;
   }
 
   BTM_TRACE_EVENT("%s after update sec_flags=0x%x", __func__,