[mynewt-nimble] branch master updated: transport/nrf5340: Fix IPC race condition

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git


The following commit(s) were added to refs/heads/master by this push:
     new efe0217  transport/nrf5340: Fix IPC race condition
efe0217 is described below

commit efe0217ad088aa6f1cfe90a4342cd4fd57134102
Author: Jerzy Kasenberg <je...@codecoup.pl>
AuthorDate: Tue Mar 1 15:20:15 2022 +0100

    transport/nrf5340: Fix IPC race condition
    
    ipc_nrf5340_recv was called in nrf_5340_ble_hci_init(), this function
    enabled BLE IPC channel if though host transport did not register yet.
    If that jump to NULL pointer happens.
    
    To prevent this IPC channel is configured after transport callbacks are
    setup. And only then interrupt is enabled for BLE IPC channel.
---
 nimble/transport/nrf5340/src/nrf5340_ble_hci.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nimble/transport/nrf5340/src/nrf5340_ble_hci.c b/nimble/transport/nrf5340/src/nrf5340_ble_hci.c
index 41f164e..df5571e 100644
--- a/nimble/transport/nrf5340/src/nrf5340_ble_hci.c
+++ b/nimble/transport/nrf5340/src/nrf5340_ble_hci.c
@@ -168,6 +168,8 @@ ble_hci_trans_acl_tx(struct os_mbuf *om)
     return (rc < 0) ? BLE_ERR_MEM_CAPACITY : 0;
 }
 
+static void nrf5340_ble_hci_trans_rx(int channel, void *user_data);
+
 #if MYNEWT_VAL(BLE_CONTROLLER)
 void
 ble_hci_trans_cfg_ll(ble_hci_trans_rx_cmd_fn *cmd_cb, void *cmd_arg,
@@ -177,6 +179,8 @@ ble_hci_trans_cfg_ll(ble_hci_trans_rx_cmd_fn *cmd_cb, void *cmd_arg,
     nrf5340_ble_hci_api.cmd_arg = cmd_arg;
     nrf5340_ble_hci_api.acl_cb = acl_cb;
     nrf5340_ble_hci_api.acl_arg = acl_arg;
+
+    ipc_nrf5340_recv(IPC_RX_CHANNEL, nrf5340_ble_hci_trans_rx, NULL);
 }
 
 int
@@ -212,6 +216,8 @@ ble_hci_trans_cfg_hs(ble_hci_trans_rx_cmd_fn *evt_cb, void *evt_arg,
     nrf5340_ble_hci_api.evt_arg = evt_arg;
     nrf5340_ble_hci_api.acl_cb = acl_cb;
     nrf5340_ble_hci_api.acl_arg = acl_arg;
+
+    ipc_nrf5340_recv(IPC_RX_CHANNEL, nrf5340_ble_hci_trans_rx, NULL);
 }
 
 int
@@ -511,6 +517,4 @@ nrf5340_ble_hci_init(void)
                          "nrf5340_ble_hci_pool_cmd_mempool");
     SYSINIT_PANIC_ASSERT(rc == 0);
 #endif
-
-    ipc_nrf5340_recv(IPC_RX_CHANNEL, nrf5340_ble_hci_trans_rx, NULL);
 }