lib: peer_manager: associate peer_id after repairing check if dup bond

If duplicate bonding data is found in auth_status_success_process(),
first check if repairing is allowed before associating the peer_id with
the connection handle. If repairing is not allowed, then the
peer_id should not be associated with the connection handle.

Signed-off-by: Andreas Moltumyr <andreas.moltumyr@nordicsemi.no>

Author: anhmolt

doc/nrf-bm/release_notes/release_notes_changelog.rst

@@ -143,6 +143,8 @@ Libraries
       * The LESC key agreement handling to clear the static RAM copy of the ECDH shared secret after the secret have been handed over to the SoftDevice using the :c:func:`sd_ble_gap_lesc_dhkey_reply` function.
       * The :kconfig:option:`CONFIG_PM_LESC_GENERATE_NEW_KEYS` Kconfig option to be enabled by default.
         This option forces the use of new ECDH key pair for each pairing procedure.
+      * The sources of the :c:enumerator:`PM_EVT_CONN_SEC_CONFIG_REQ` event to fill the peer ID field.
+        The value of the peer ID field should be used instead of calling the :c:func:`pm_peer_id_get` function when handling this event.
 
    * Fixed:
 

lib/bluetooth/peer_manager/modules/security_dispatcher.c

@@ -465,14 +465,15 @@ static void sec_info_request_process(const ble_gap_evt_t *gap_evt)
  *
  * @param[in]  conn_handle  The connection the sec parameters are needed for.
  */
-static void send_config_req(uint16_t conn_handle)
+static void send_config_req(uint16_t conn_handle, uint16_t peer_id)
 {
 	struct pm_evt evt;
 
 	memset(&evt, 0, sizeof(evt));
 
 	evt.evt_id = PM_EVT_CONN_SEC_CONFIG_REQ;
 	evt.conn_handle = conn_handle;
+	evt.peer_id = peer_id;
 
 	evt_send(&evt);
 }
@@ -603,17 +604,17 @@ static void auth_status_success_process(const ble_gap_evt_t *gap_evt)
 							 PM_PEER_ID_INVALID);
 
 		if (peer_id != PM_PEER_ID_INVALID) {
-			/* The peer has been identified as someone we have already bonded with. */
-			im_new_peer_id(conn_handle, peer_id);
-
 			/* If the flag is true, the configuration has been requested before. */
 			if (!allow_repairing(conn_handle)) {
-				send_config_req(conn_handle);
+				send_config_req(conn_handle, peer_id);
 				if (!allow_repairing(conn_handle)) {
 					pairing_success_evt_send(gap_evt, false);
 					return;
 				}
 			}
+
+			/* The peer has been identified as someone we have already bonded with. */
+			im_new_peer_id(conn_handle, peer_id);
 		}
 	}
 
@@ -820,9 +821,10 @@ uint32_t smd_params_reply(uint16_t conn_handle, ble_gap_sec_params_t *sec_params
 {
 	__ASSERT_NO_MSG(module_initialized);
 
-	uint8_t role = pm_conn_state_role(conn_handle);
 	uint32_t nrf_err = NRF_SUCCESS;
+	uint8_t role = pm_conn_state_role(conn_handle);
 	uint8_t sec_status = BLE_GAP_SEC_STATUS_SUCCESS;
+	uint16_t peer_id;
 	ble_gap_sec_keyset_t sec_keyset;
 
 	memset(&sec_keyset, 0, sizeof(ble_gap_sec_keyset_t));
@@ -850,12 +852,13 @@ uint32_t smd_params_reply(uint16_t conn_handle, ble_gap_sec_params_t *sec_params
 			sec_status = BLE_GAP_SEC_STATUS_PAIRING_NOT_SUPP;
 		} else {
 #if defined(CONFIG_SOFTDEVICE_PERIPHERAL)
-			if ((im_peer_id_get_by_conn_handle(conn_handle) != PM_PEER_ID_INVALID) &&
-			    (role == BLE_GAP_ROLE_PERIPH) && !allow_repairing(conn_handle)) {
+			peer_id = im_peer_id_get_by_conn_handle(conn_handle);
+			if ((peer_id != PM_PEER_ID_INVALID) && (role == BLE_GAP_ROLE_PERIPH) &&
+			    !allow_repairing(conn_handle)) {
 				/* Bond already exists. Reject the pairing request if the user
 				 * doesn't intervene.
 				 */
-				send_config_req(conn_handle);
+				send_config_req(conn_handle, peer_id);
 				if (!allow_repairing(conn_handle)) {
 					/* Reject pairing. */
 					sec_status = BLE_GAP_SEC_STATUS_PAIRING_NOT_SUPP;