net/ionic: fix double-free of mbufs when emptying array
PATCH 1/1 net/ionic: fix double-free of mbufs when emptying array
The bulk-allocation array is used back to front, so we need to free everything before the marker, not after it. Flip ionic_empty_array() so that it frees from 0 to the provided index. Adjust the callers as needed.
Fixes 218afd825bca ("net/ionic: do bulk allocations of Rx mbufs")
Signed-off-by Andrew Boyer <[email protected]>
--- drivers/net/ionic/ionic_rxtx.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/net/ionic/ionic_rxtx.c +9 -7
@@ -26,38 +26,40 @@#include "ionic_logs.h" static void -ionic_empty_array (void **array,uint32_t cnt,uint16_t idx) +ionic_empty_array (void **array,uint32_t free_idx,uint32_t zero_idx) {uint32_t i; -for (i = idx; i < cnt; i++) +for (i =0 ; i < free_idx; i++)if (array[i])rte_pktmbuf_free_seg (array[i]); -memset (array,0 ,sizeof (void *) * cnt); +memset (array,0 ,sizeof (void *) * zero_idx); } static void __rte_coldionic_tx_empty (struct ionic_tx_qcq *txq) {struct ionic_queue *q = &txq->qcq.q; +uint32_t info_len = q->num_descs * q->num_segs; -ionic_empty_array (q->info, q->num_descs * q->num_segs,0 ); +ionic_empty_array (q->info, info_len, info_len); } static void __rte_coldionic_rx_empty (struct ionic_rx_qcq *rxq) {struct ionic_queue *q = &rxq->qcq.q; +uint32_t info_len = q->num_descs * q->num_segs;/* * Walk the full info array so that the clean up includes any * fragments that were left dangling for later reuse */ -ionic_empty_array (q->info, q->num_descs * q->num_segs,0 ); +ionic_empty_array (q->info, info_len, info_len); -ionic_empty_array ((void **)rxq->mbs, -IONIC_MBUF_BULK_ALLOC , rxq->mb_idx); +ionic_empty_array ((void **)rxq->mbs, rxq->mb_idx, +IONIC_MBUF_BULK_ALLOC ); rxq->mb_idx =0 ; }
Signature · 1 line
2.17.1
Ferruh Yigit
AppliedQuoted 10 lines · Andrew Boyer
The bulk-allocation array is used back to front, so we need to free everything before the marker, not after it. Flip
ionic_empty_array()so that it frees from 0 to the provided index. Adjust the callers as needed.Fixes 218afd825bca ("net/ionic: do bulk allocations of Rx mbufs")Signed-off-by Andrew Boyer <[email protected]>
Applied to dpdk-next-net/main, thanks.