From: Andrew Boyer <andrew.boyer@amd.com>
To: <dev@dpdk.org>
Cc: Andrew Boyer <andrew.boyer@amd.com>, <stable@dpdk.org>
Subject: [PATCH] net/ionic: fix double-free of mbufs when emptying array
Date: Mon, 1 Jul 2024 08:19:43 -0700 [thread overview]
Message-ID: <20240701151943.43121-1-andrew.boyer@amd.com> (raw)
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")
CC: stable@dpdk.org
Signed-off-by: Andrew Boyer <andrew.boyer@amd.com>
---
drivers/net/ionic/ionic_rxtx.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c
index 923f517661..339b20f113 100644
--- a/drivers/net/ionic/ionic_rxtx.c
+++ b/drivers/net/ionic/ionic_rxtx.c
@@ -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_cold
ionic_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_cold
ionic_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;
}
--
2.17.1
next reply other threads:[~2024-07-01 15:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-01 15:19 Andrew Boyer [this message]
2024-07-07 18:55 ` Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240701151943.43121-1-andrew.boyer@amd.com \
--to=andrew.boyer@amd.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).