From 1775052144370cef53bcdd14565abf7e7bd95009 Mon Sep 17 00:00:00 2001 From: Xavier Arteaga Date: Tue, 15 Dec 2020 16:07:09 +0100 Subject: [PATCH] Fix NR PDSCH DMRS cinit and zero after free --- lib/src/phy/ch_estimation/dmrs_pdsch.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/src/phy/ch_estimation/dmrs_pdsch.c b/lib/src/phy/ch_estimation/dmrs_pdsch.c index f6f3b8def..85a5227c0 100644 --- a/lib/src/phy/ch_estimation/dmrs_pdsch.c +++ b/lib/src/phy/ch_estimation/dmrs_pdsch.c @@ -453,7 +453,7 @@ static uint32_t srslte_dmrs_pdsch_seed(const srslte_carrier_nr_t* carrier, n_id = dmrs_cfg->scrambling_id1; } - return (uint32_t)(((((SRSLTE_MAX_NSYMB * slot_idx + symbol_idx + 1UL) * (2UL * n_id + 1UL)) << 17UL) + + return (uint32_t)(((((SRSLTE_NSYMB_PER_SLOT_NR * slot_idx + symbol_idx + 1UL) * (2UL * n_id + 1UL)) << 17UL) + (2UL * carrier->id + n_scid)) & (uint64_t)INT32_MAX); } @@ -485,6 +485,8 @@ void srslte_dmrs_pdsch_free(srslte_dmrs_pdsch_t* q) if (q->temp) { free(q->temp); } + + SRSLTE_MEM_ZERO(q, srslte_dmrs_pdsch_t, 1); } int srslte_dmrs_pdsch_set_carrier(srslte_dmrs_pdsch_t* q, const srslte_carrier_nr_t* carrier)