From: "Renyong Wan" <wanry@yunsilicon.com>
To: <dev@dpdk.org>
Cc: <thomas@monjalon.net>, <stephen@networkplumber.org>,
<qianr@yunsilicon.com>, <nana@yunsilicon.com>,
<zhangxx@yunsilicon.com>, <xudw@yunsilicon.com>,
<jacky@yunsilicon.com>, <weihg@yunsilicon.com>,
<zhenghy@yunsilicon.com>
Subject: [PATCH 06/12] net/xsc: check possible null pointer dereference
Date: Sat, 22 Feb 2025 11:57:44 +0800 [thread overview]
Message-ID: <20250222035742.2290067-7-wanry@yunsilicon.com> (raw)
In-Reply-To: <20250222035732.2290067-1-wanry@yunsilicon.com>
This issue was reported by PVS studio, described as:
https://pvs-studio.com/en/docs/warnings/v522/
Signed-off-by: Rong Qian <qianr@yunsilicon.com>
Signed-off-by: Renyong Wan <wanry@yunsilicon.com>
---
drivers/net/xsc/xsc_ethdev.c | 15 +++++++++++++--
drivers/net/xsc/xsc_rx.c | 5 +++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/drivers/net/xsc/xsc_ethdev.c b/drivers/net/xsc/xsc_ethdev.c
index d04fe78d3f..44d861e484 100644
--- a/drivers/net/xsc/xsc_ethdev.c
+++ b/drivers/net/xsc/xsc_ethdev.c
@@ -137,8 +137,8 @@ xsc_ethdev_enable(struct rte_eth_dev *dev)
int pcie_logic_port = 0;
int qp_set_id;
int repr_id;
- struct xsc_rxq_data *rxq = xsc_rxq_get(priv, 0);
- uint16_t rx_qpn = (uint16_t)rxq->qpn;
+ struct xsc_rxq_data *rxq;
+ uint16_t rx_qpn;
int i, vld;
struct xsc_txq_data *txq;
struct xsc_repr_port *repr;
@@ -147,6 +147,11 @@ xsc_ethdev_enable(struct rte_eth_dev *dev)
if (priv->funcid_type != XSC_PHYPORT_MAC_FUNCID)
return -ENODEV;
+ rxq = xsc_rxq_get(priv, 0);
+ if (rxq == NULL)
+ return -EINVAL;
+
+ rx_qpn = (uint16_t)rxq->qpn;
hwinfo = &priv->xdev->hwinfo;
repr_id = priv->representor_id;
repr = &priv->xdev->repr_ports[repr_id];
@@ -162,6 +167,8 @@ xsc_ethdev_enable(struct rte_eth_dev *dev)
for (i = 0; i < priv->num_sq; i++) {
txq = xsc_txq_get(priv, i);
+ if (txq == NULL)
+ return -EINVAL;
xsc_dev_modify_qp_status(priv->xdev, txq->qpn, 1, XSC_CMD_OP_RTR2RTS_QP);
xsc_dev_modify_qp_qostree(priv->xdev, txq->qpn);
xsc_dev_set_qpsetid(priv->xdev, txq->qpn, qp_set_id);
@@ -229,6 +236,8 @@ xsc_txq_start(struct xsc_ethdev_priv *priv)
for (i = 0; i != priv->num_sq; ++i) {
txq_data = xsc_txq_get(priv, i);
+ if (txq_data == NULL)
+ goto error;
xsc_txq_elts_alloc(txq_data);
ret = xsc_txq_obj_new(priv->xdev, txq_data, offloads, i);
if (ret < 0)
@@ -270,6 +279,8 @@ xsc_rxq_start(struct xsc_ethdev_priv *priv)
for (i = 0; i != priv->num_rq; ++i) {
rxq_data = xsc_rxq_get(priv, i);
+ if (rxq_data == NULL)
+ goto error;
if (dev->data->rx_queue_state[i] != RTE_ETH_QUEUE_STATE_STARTED) {
ret = xsc_rxq_elts_alloc(rxq_data);
if (ret != 0)
diff --git a/drivers/net/xsc/xsc_rx.c b/drivers/net/xsc/xsc_rx.c
index 3230710656..140d7728d6 100644
--- a/drivers/net/xsc/xsc_rx.c
+++ b/drivers/net/xsc/xsc_rx.c
@@ -280,6 +280,9 @@ xsc_rss_qp_create(struct xsc_ethdev_priv *priv, int port_id)
char name[RTE_ETH_NAME_MAX_LEN] = { 0 };
rxq_data = xsc_rxq_get(priv, 0);
+ if (rxq_data == NULL)
+ return -EINVAL;
+
log_ele = rte_log2_u32(sizeof(struct xsc_wqe_data_seg));
wqe_n = rxq_data->wqe_s;
log_rq_sz = rte_log2_u32(wqe_n * hwinfo->recv_seg_num);
@@ -385,6 +388,8 @@ xsc_rxq_rss_obj_new(struct xsc_ethdev_priv *priv, uint16_t port_id)
/* Create CQ */
for (i = 0; i < priv->num_rq; ++i) {
rxq_data = xsc_rxq_get(priv, i);
+ if (rxq_data == NULL)
+ return -EINVAL;
memset(&cq_params, 0, sizeof(cq_params));
memset(&cq_info, 0, sizeof(cq_info));
--
2.25.1
next prev parent reply other threads:[~2025-02-22 3:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-22 3:57 [PATCH 00/12] net/xsc: Resolve issues from PVS and Coverity Scan Renyong Wan
2025-02-22 3:57 ` [PATCH 01/12] net/xsc: avoid integer overflow Renyong Wan
2025-02-22 3:57 ` [PATCH 02/12] net/xsc: remove useless call Renyong Wan
2025-02-22 3:57 ` [PATCH 03/12] net/xsc: address incorrect format warnings Renyong Wan
2025-02-22 3:57 ` [PATCH 04/12] net/xsc: remove always-true if expressions Renyong Wan
2025-02-22 3:57 ` [PATCH 05/12] net/xsc: avoid variable is assigned but not used Renyong Wan
2025-02-22 3:57 ` Renyong Wan [this message]
2025-02-22 3:57 ` [PATCH 07/12] net/xsc: avoid potential null pointer before used Renyong Wan
2025-02-22 3:57 ` [PATCH 08/12] net/xsc: remove always-true part of if expression Renyong Wan
2025-02-22 3:57 ` [PATCH 09/12] net/xsc: avoid assign the same value to a variable Renyong Wan
2025-02-22 3:57 ` [PATCH 10/12] net/xsc: avoid initialize by same function Renyong Wan
2025-02-22 3:57 ` [PATCH 11/12] net/xsc: optimize memcmp returns not 0 check Renyong Wan
2025-02-22 3:57 ` [PATCH 12/12] net/xsc: avoid pointer cast to unrelated class Renyong Wan
2025-02-22 17:30 ` [PATCH 00/12] net/xsc: Resolve issues from PVS and Coverity Scan Stephen Hemminger
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=20250222035742.2290067-7-wanry@yunsilicon.com \
--to=wanry@yunsilicon.com \
--cc=dev@dpdk.org \
--cc=jacky@yunsilicon.com \
--cc=nana@yunsilicon.com \
--cc=qianr@yunsilicon.com \
--cc=stephen@networkplumber.org \
--cc=thomas@monjalon.net \
--cc=weihg@yunsilicon.com \
--cc=xudw@yunsilicon.com \
--cc=zhangxx@yunsilicon.com \
--cc=zhenghy@yunsilicon.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).