[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250519102132.2089-1-vulab@iscas.ac.cn>
Date: Mon, 19 May 2025 18:21:32 +0800
From: Wentao Liang <vulab@...as.ac.cn>
To: irusskikh@...vell.com,
andrew+netdev@...n.ch,
davem@...emloft.net,
edumazet@...gle.com,
kuba@...nel.org,
pabeni@...hat.com
Cc: netdev@...r.kernel.org,
linux-kernel@...r.kernel.org,
Wentao Liang <vulab@...as.ac.cn>,
stable@...r.kernel.org
Subject: [PATCH] net: atlantic: Add error handling in set_raw_ingress_record()
The set_raw_ingress_record() calls aq_mss_mdio_write() but does not
check the return value. A proper implementation can be found in
get_raw_ingress_record().
Add error handling for aq_mss_mdio_write(). If the write fails,
return immediately.
Fixes: b8f8a0b7b5cb ("net: atlantic: MACSec ingress offload HW bindings")
Cc: stable@...r.kernel.org # v5.7
Signed-off-by: Wentao Liang <vulab@...as.ac.cn>
---
.../aquantia/atlantic/macsec/macsec_api.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c b/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c
index 431924959520..5e87f8b749c5 100644
--- a/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c
+++ b/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c
@@ -62,6 +62,7 @@ static int set_raw_ingress_record(struct aq_hw_s *hw, u16 *packed_record,
{
struct mss_ingress_lut_addr_ctl_register lut_sel_reg;
struct mss_ingress_lut_ctl_register lut_op_reg;
+ int ret;
unsigned int i;
@@ -105,11 +106,15 @@ static int set_raw_ingress_record(struct aq_hw_s *hw, u16 *packed_record,
lut_op_reg.bits_0.lut_read = 0;
lut_op_reg.bits_0.lut_write = 1;
- aq_mss_mdio_write(hw, MDIO_MMD_VEND1,
- MSS_INGRESS_LUT_ADDR_CTL_REGISTER_ADDR,
- lut_sel_reg.word_0);
- aq_mss_mdio_write(hw, MDIO_MMD_VEND1, MSS_INGRESS_LUT_CTL_REGISTER_ADDR,
- lut_op_reg.word_0);
+ ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,
+ MSS_INGRESS_LUT_ADDR_CTL_REGISTER_ADDR,
+ lut_sel_reg.word_0);
+ if (unlikely(ret))
+ return ret;
+ ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1, MSS_INGRESS_LUT_CTL_REGISTER_ADDR,
+ lut_op_reg.word_0);
+ if (unlikely(ret))
+ return ret;
return 0;
}
--
2.42.0.windows.2
Powered by blists - more mailing lists