From: Ajit Khaparde <ajit.khaparde@broadcom.com>
To: dev@dpdk.org
Cc: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>,
Somnath Kotur <somnath.kotur@broadcom.com>
Subject: [PATCH v2 05/13] net/bnxt: add check for invalid mbuf passed by application
Date: Sun, 27 Oct 2024 10:11:20 -0700 [thread overview]
Message-ID: <20241027171128.50221-6-ajit.khaparde@broadcom.com> (raw)
In-Reply-To: <20241027171128.50221-1-ajit.khaparde@broadcom.com>
From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
If the application passes invalid mbuf for a Tx pkt, this could
escape all the existing driver checks and driver could end up sending
down invalid TX BDs to the HW. This in turn could lead to a FW reset.
Fix by validating the "mbuf->buf_iova" or "mbuf->buf_addr" passed for
the Tx pkt by the application.
Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
---
drivers/net/bnxt/bnxt_txr.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 51d3689e9c..4e9e377d5b 100644
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -209,6 +209,25 @@ bnxt_invalid_nb_segs(struct rte_mbuf *tx_pkt)
return (nb_segs != tx_pkt->nb_segs);
}
+static int bnxt_invalid_mbuf(struct rte_mbuf *mbuf)
+{
+ uint32_t mbuf_size = sizeof(struct rte_mbuf) + mbuf->priv_size;
+ const char *reason;
+
+ if (unlikely(rte_eal_iova_mode() != RTE_IOVA_VA &&
+ rte_eal_iova_mode() != RTE_IOVA_PA))
+ return 0;
+
+ if (unlikely(rte_mbuf_check(mbuf, 1, &reason)))
+ return -EINVAL;
+
+ if (unlikely(mbuf->buf_iova < mbuf_size ||
+ (mbuf->buf_iova != rte_mempool_virt2iova(mbuf) + mbuf_size)))
+ return -EINVAL;
+
+ return 0;
+}
+
static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
struct bnxt_tx_queue *txq,
uint16_t *coal_pkts,
@@ -236,6 +255,9 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
if (unlikely(is_bnxt_in_error(txq->bp)))
return -EIO;
+ if (unlikely(bnxt_invalid_mbuf(tx_pkt)))
+ return -EINVAL;
+
if (unlikely(bnxt_invalid_nb_segs(tx_pkt)))
return -EINVAL;
--
2.39.5 (Apple Git-154)
next prev parent reply other threads:[~2024-10-27 17:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-27 17:11 [PATCH v2 00/13] patchset for bnxt PMD Ajit Khaparde
2024-10-27 17:11 ` [PATCH v2 01/13] net/bnxt: fix TCP and UDP checksum flags Ajit Khaparde
2024-10-27 17:11 ` [PATCH v2 02/13] net/bnxt: fix bad action offset in Tx bd Ajit Khaparde
2024-10-27 17:11 ` [PATCH v2 03/13] net/bnxt: add check to validate TSO segment size Ajit Khaparde
2024-10-27 17:11 ` [PATCH v2 04/13] net/bnxt: add check for number of segs Ajit Khaparde
2024-10-27 17:11 ` Ajit Khaparde [this message]
2024-10-27 17:11 ` [PATCH v2 06/13] net/bnxt: free and account a bad Tx mbuf Ajit Khaparde
2024-10-27 17:11 ` [PATCH v2 07/13] net/bnxt: register for and handle RSS change event Ajit Khaparde
2024-10-27 17:11 ` [PATCH v2 08/13] net/bnxt: fix LRO offload capability Ajit Khaparde
2024-10-27 17:11 ` [PATCH v2 09/13] net/bnxt: disable VLAN filter when TF is enabled Ajit Khaparde
2024-10-27 17:11 ` [PATCH v2 10/13] net/bnxt: remove the VNIC async event handler Ajit Khaparde
2024-10-27 17:11 ` [PATCH v2 11/13] net/bnxt: remove some unnecessary logs Ajit Khaparde
2024-10-27 17:11 ` [PATCH v2 12/13] net/bnxt: add support for buffer split Rx offload Ajit Khaparde
2024-10-27 17:11 ` [PATCH v2 13/13] net/bnxt: remove unnecessary ifdef Ajit Khaparde
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=20241027171128.50221-6-ajit.khaparde@broadcom.com \
--to=ajit.khaparde@broadcom.com \
--cc=dev@dpdk.org \
--cc=kalesh-anakkur.purayil@broadcom.com \
--cc=somnath.kotur@broadcom.com \
/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).