Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 148a8936 authored by Pulkit Bhuwalka's avatar Pulkit Bhuwalka Committed by android-build-merger
Browse files

Fix SIGBUS error in BT stack when pairing with ARM boards am: 00733989

am: 0ba4a70b

Change-Id: I882416f685753e7da7188a29f892d39c3a4e9b15
parents 9a4a4166 0ba4a70b
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
 ******************************************************************************/

#include <string.h>
#include "btif_common.h"
#include "device/include/interop.h"
#include "include/bt_target.h"
#include "stack/btm/btm_int.h"
@@ -979,7 +980,8 @@ void smp_proc_srk_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {

  /* save CSRK to security record */
  le_key.sec_level = p_cb->sec_level;
  memcpy(le_key.csrk, p_data, BT_OCTET16_LEN); /* get peer CSRK */
  maybe_non_aligned_memcpy(le_key.csrk, p_data,
                           BT_OCTET16_LEN);    /* get peer CSRK */
  le_key.counter = 0;                          /* initialize the peer counter */

  if ((p_cb->peer_auth_req & SMP_AUTH_BOND) &&