From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1439C488FB for ; Fri, 10 Oct 2025 08:33:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0BD0D4028C; Fri, 10 Oct 2025 08:33:25 +0200 (CEST) Received: from smtpbg151.qq.com (smtpbg151.qq.com [18.169.211.239]) by mails.dpdk.org (Postfix) with ESMTP id 12CBF402A0 for ; Fri, 10 Oct 2025 08:33:22 +0200 (CEST) X-QQ-mid: zesmtpgz4t1760077994tf82ec2c3 X-QQ-Originating-IP: Lf7IaGDQL2yBwDp2oEJ9FlPm2Iztu6s394TVIrkSKu0= Received: from sunshaojie-Precision-5820-Tower ( [203.174.112.180]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 10 Oct 2025 14:33:12 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 16773758745659707712 EX-QQ-RecipientCnt: 5 From: Wenbo Cao To: stephen@networkplumber.org, Wenbo Cao , Ferruh Yigit Cc: yaojun@mucse.com, stable@dpdk.org Subject: [PATCH v3 1/4] net/rnp: add check firmware respond info Date: Fri, 10 Oct 2025 14:33:03 +0800 Message-Id: <20251010063306.161198-2-caowenbo@mucse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251010063306.161198-1-caowenbo@mucse.com> References: <20251010063306.161198-1-caowenbo@mucse.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: zesmtpgz:mucse.com:qybglogicsvrgz:qybglogicsvrgz5a-0 X-QQ-XMAILINFO: M5znx2hx04lbEbJNXZhvckHlQ9GZFdFh3smmcvd4YvafN0Su40Ew1SjW Qz/G+88w4LlUXhcS0GdwPOzhtqUmqjELa1bGf73zenYem7UtEnzXZFr/KvJm1LftHoxA/Xp NqvptxXy0tOcymwfZAxxPbsvaRpJfeiF7VD5K3VQ13exZ/DwZTHXpFnjFXTAodvWLGZntce VB5df/r+T5wQCd+K0V9gtKK9YrQ9Wf0iwnBhuIqc+IVh2zxX7yqH8CwA7wxM3XfzmH8zBDH sSN5YP5iSTOLWAhni5og+W4QZyh+Qq9TIpNEXeZrVa8tOcx170/68oJqi+qkt3ijLsj+93a 4Dr8KhaxVRF2wQfmfb07J0Om9hOYzmE3GA1rnOk/TO3jy3M7QLXaWx7NGIhj0+R8BRUjx9m vokD5Xdf5KqFKFOd+kURvZjvh3QxAoPyiPhskZb/ePdwiXA/fJG+QoeDw3yPWSmDYY5O5K2 OGdff+iSFWV0CNxX/tLDIJIppNhqkXHAYJJI1Gr+5hQ4s4mOAExUCt2TpKLlotlQ1TPOTlt pnp2bfhTXYmT3Mlsyc/sVcnN8Dyz6nYcfMvWcM/ZfF1NBhf8T+ESacyQBk4m80pJJ2On5vp 2tZk+byeFLu1qjRlj1Rkucr207NancAu00XfCEWV4tLQh47JfXcTtQHvfYbejy42FU9rS7B 0jDzMW9xwfDVdoKe0uFLBRlPaSdKz/rYt/EAUc3YrC68xO3FkRQSnqQkwHn19cSeMcR8le4 kedIejSyZIo3Xzv9ClLvKlU+6B66g2ZWBr1dq3e9UemW/rQOS7z2Vt0LWM8KF2YzBMBXrWD vlOIGcLRqXlsydknHy7fTjdtcJCtI7+aRUsAdIjpHNNFmhyIiQpY5G7d4RDKZkSv2ZXeL14 8tcSePLEinIPEKQUdbFlgWYwNHlcEeOtr6Hn/bSmJWwff4aN9/9M0kiRDGIYnRi2kBYKc6W JjmHpUSuRBjUMwdAtg5tXt7z+12MvEN3CnrwRXV0StLzFrOHEkvy/RamxhN4X5Q3fS5xkti /JMbXT52LbbNGPsSTr X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= X-QQ-RECHKSPAM: 0 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Add logic checks at critical points to detect potentially illegal firmware information, preventing subsequent logic exceptions. Fixes: 52aae4ed4ffb ("net/rnp: add device capabilities") Fixes: 52dfb84e14be ("net/rnp: add device init and uninit") Cc: stable@dpdk.org Signed-off-by: Wenbo Cao Reviewed-by: Stephen Hemminger --- drivers/net/rnp/base/rnp_mbx_fw.c | 17 +++++++++++++++-- drivers/net/rnp/rnp_ethdev.c | 16 ++++++++-------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/drivers/net/rnp/base/rnp_mbx_fw.c b/drivers/net/rnp/base/rnp_mbx_fw.c index 3e7cf7f9ad..7ae8763a4a 100644 --- a/drivers/net/rnp/base/rnp_mbx_fw.c +++ b/drivers/net/rnp/base/rnp_mbx_fw.c @@ -230,6 +230,7 @@ rnp_fw_get_phy_capability(struct rnp_eth_port *port, return 0; } +#define RNP_MAX_LANE_MASK (0xf) int rnp_mbx_fw_get_capability(struct rnp_eth_port *port) { struct rnp_phy_abilities_rep ability; @@ -252,17 +253,29 @@ int rnp_mbx_fw_get_capability(struct rnp_eth_port *port) hw->nic_mode = ability.nic_mode; /* get phy<->lane mapping info */ lane_cnt = rte_popcount32(hw->lane_mask); + if (lane_cnt > RNP_MAX_PORT_OF_PF) { + RNP_PMD_LOG(ERR, "firmware invalid lane_mask"); + return -EINVAL; + } temp_mask = hw->lane_mask; + if (temp_mask == 0 || temp_mask > RNP_MAX_LANE_MASK) { + RNP_PMD_LOG(ERR, "lane_mask is invalid 0x%.2x", temp_mask); + return -EINVAL; + } if (ability.e.ports_is_sgmii_valid) is_sgmii_bits = ability.e.lane_is_sgmii; for (idx = 0; idx < lane_cnt; idx++) { hw->phy_port_ids[idx] = port_ids[idx]; - lane_bit = ffs(temp_mask) - 1; + if (temp_mask == 0) { + RNP_PMD_LOG(ERR, "temp_mask is zero at idx=%d", idx); + return -EINVAL; + } + lane_bit = rte_ffs32(temp_mask) - 1; lane_idx = port_ids[idx] % lane_cnt; hw->lane_of_port[lane_idx] = lane_bit; is_sgmii = lane_bit & is_sgmii_bits ? 1 : 0; hw->lane_is_sgmii[lane_idx] = is_sgmii; - temp_mask &= ~RTE_BIT32(lane_bit); + temp_mask &= ~(1ULL << lane_bit); } hw->max_port_num = lane_cnt; } diff --git a/drivers/net/rnp/rnp_ethdev.c b/drivers/net/rnp/rnp_ethdev.c index de1c077f61..24eb0b16dd 100644 --- a/drivers/net/rnp/rnp_ethdev.c +++ b/drivers/net/rnp/rnp_ethdev.c @@ -751,17 +751,17 @@ rnp_get_speed_caps(struct rte_eth_dev *dev) { struct rnp_eth_port *port = RNP_DEV_TO_PORT(dev); uint32_t speed_cap = 0; - uint32_t i = 0, speed; uint32_t support_link; - uint32_t link_types; + uint32_t speed = 0; + int bit_pos = 0; support_link = port->attr.phy_meta.supported_link; - link_types = rte_popcount64(support_link); - if (!link_types) + if (support_link == 0) return 0; - for (i = 0; i < link_types; i++) { - speed = ffs(support_link) - 1; - switch (RTE_BIT32(speed)) { + while (support_link) { + bit_pos = rte_ffs32(support_link) - 1; + speed = RTE_BIT32(bit_pos); + switch (speed) { case RNP_SPEED_CAP_10M_FULL: speed_cap |= RTE_ETH_LINK_SPEED_10M; break; @@ -789,7 +789,7 @@ rnp_get_speed_caps(struct rte_eth_dev *dev) default: speed_cap |= 0; } - support_link &= ~RTE_BIT32(speed); + support_link &= ~speed; } if (!port->attr.phy_meta.link_autoneg) speed_cap |= RTE_ETH_LINK_SPEED_FIXED; -- 2.34.1