Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Chen Ni <nichen@iscas.ac.cn>
To:     borisp@nvidia.com, saeedm@nvidia.com, leon@kernel.org,
        davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
        pabeni@redhat.com, sd@queasysnail.net, raeds@nvidia.com,
        ehakim@nvidia.com, liorna@nvidia.com, phaddad@nvidia.com,
        atenart@kernel.org
Cc:     netdev@vger.kernel.org, linux-rdma@vger.kernel.org,
        linux-kernel@vger.kernel.org, Chen Ni <nichen@iscas.ac.cn>
Subject: [PATCH] net/mlx5e: Add missing check for xa_load
Date:   Mon,  4 Sep 2023 08:12:10 +0000
Message-Id: <20230904081210.23901-1-nichen@iscas.ac.cn>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Add check for xa_load() in order to avoid NULL pointer
dereference.

Fixes: b7c9400cbc48 ("net/mlx5e: Implement MACsec Rx data path using MACsec skb_metadata_dst")
Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
---
 .../net/ethernet/mellanox/mlx5/core/en_accel/macsec.c  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
index c9c1db971652..d2467c0bc3c8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
@@ -1673,10 +1673,12 @@ void mlx5e_macsec_offload_handle_rx_skb(struct net_device *netdev,
 
 	rcu_read_lock();
 	sc_xarray_element = xa_load(&macsec->sc_xarray, fs_id);
-	rx_sc = sc_xarray_element->rx_sc;
-	if (rx_sc) {
-		dst_hold(&rx_sc->md_dst->dst);
-		skb_dst_set(skb, &rx_sc->md_dst->dst);
+	if (sc_xarray_element) {
+		rx_sc = sc_xarray_element->rx_sc;
+		if (rx_sc) {
+			dst_hold(&rx_sc->md_dst->dst);
+			skb_dst_set(skb, &rx_sc->md_dst->dst);
+		}
 	}
 
 	rcu_read_unlock();
-- 
2.25.1