michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: nRF54Lx: Fix MDATA length to avoid MIC failures

Browse source 
Fix MDATA length with extra bytes to mitigate MIC failures.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2025-05-13 14:30:26 +02:00 • committed by Benjamin Cabé
commit 20576597df
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
View file

@ -2072,6 +2072,11 @@ struct ccm_job_ptr {
#define CCM_JOB_PTR_ATTRIBUTE_ADATA 13U #define CCM_JOB_PTR_ATTRIBUTE_ADATA 13U
#define CCM_JOB_PTR_ATTRIBUTE_MDATA 14U #define CCM_JOB_PTR_ATTRIBUTE_MDATA 14U
/* For a Max 27 byte PDU reception, an actual 26 byte PDU needs the below extra MDATA length to
* mitigate MIC failures. I.e. MDATA length = 27 + 4 (MIC size) + 2 (extra).
*/
#define NRF_CCM_WORKAROUND_XXXX_MDATA_EXTRA 2U
static struct { static struct {
uint16_t in_alen; uint16_t in_alen;
uint16_t in_mlen; uint16_t in_mlen;
@ -2253,7 +2258,7 @@ static void *radio_ccm_ext_rx_pkt_set(struct ccm *cnf, uint8_t phy, uint8_t pdu_
ccm_job.in[3].attribute = CCM_JOB_PTR_ATTRIBUTE_ADATA; ccm_job.in[3].attribute = CCM_JOB_PTR_ATTRIBUTE_ADATA;
ccm_job.in[4].ptr = (void *)((uint8_t *)_pkt_scratch + 3U); ccm_job.in[4].ptr = (void *)((uint8_t *)_pkt_scratch + 3U);
ccm_job.in[4].length = mlen; ccm_job.in[4].length = mlen + NRF_CCM_WORKAROUND_XXXX_MDATA_EXTRA;
ccm_job.in[4].attribute = CCM_JOB_PTR_ATTRIBUTE_MDATA; ccm_job.in[4].attribute = CCM_JOB_PTR_ATTRIBUTE_MDATA;
ccm_job.in[5].ptr = NULL; ccm_job.in[5].ptr = NULL;