net/mlx5: Check device memory pointer before usage

[ Upstream commit 70f238c902b8c0461ae6fbb8d1a0bbddc4350eea ]

Add a NULL check before accessing device memory to prevent a crash if
dev->dm allocation in mlx5_init_once() fails.

Fixes: c9b9dcb430b3 ("net/mlx5: Move device memory management to mlx5_core")
Signed-off-by: Stav Aviram <saviram@nvidia.com>
Link: https://patch.msgid.link/c88711327f4d74d5cebc730dc629607e989ca187.1751370035.git.leon@kernel.org
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/infiniband/hw/mlx5/dm.c b/drivers/infiniband/hw/mlx5/dm.c
index 3669c90b2dadc6ab40a80cc7fb1d0d06369b793c..672e5cfd2fca5d640292062aff7ebf94afa651c4 100644 (file)
--- a/drivers/infiniband/hw/mlx5/dm.c
+++ b/drivers/infiniband/hw/mlx5/dm.c
@@ -282,7 +282,7 @@ static struct ib_dm *handle_alloc_dm_memic(struct ib_ucontext *ctx,
        int err;
        u64 address;
 
-       if (!MLX5_CAP_DEV_MEM(dm_db->dev, memic))
+       if (!dm_db || !MLX5_CAP_DEV_MEM(dm_db->dev, memic))
                return ERR_PTR(-EOPNOTSUPP);
 
        dm = kzalloc(sizeof(*dm), GFP_KERNEL);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c
index 9482e51ac82a585779bf81b92ec00e8f33595f9f..bdbbfaf504d988c3577b46da5249df33798f3670 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c
@@ -28,7 +28,7 @@ struct mlx5_dm *mlx5_dm_create(struct mlx5_core_dev *dev)
 
        dm = kzalloc(sizeof(*dm), GFP_KERNEL);
        if (!dm)
-               return ERR_PTR(-ENOMEM);
+               return NULL;
 
        spin_lock_init(&dm->lock);
 
@@ -80,7 +80,7 @@ err_modify_hdr:
 err_steering:
        kfree(dm);
 
-       return ERR_PTR(-ENOMEM);
+       return NULL;
 }
 
 void mlx5_dm_cleanup(struct mlx5_core_dev *dev)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 8c9633f740b48514bbd30b0b8e90071bf7a1111c..a53f222e3feed4dacc785ae3033f936373b855d4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -1022,9 +1022,6 @@ static int mlx5_init_once(struct mlx5_core_dev *dev)
        }
 
        dev->dm = mlx5_dm_create(dev);
-       if (IS_ERR(dev->dm))
-               mlx5_core_warn(dev, "Failed to init device memory %ld\n", PTR_ERR(dev->dm));
-
        dev->tracer = mlx5_fw_tracer_create(dev);
        dev->hv_vhca = mlx5_hv_vhca_create(dev);
        dev->rsc_dump = mlx5_rsc_dump_create(dev);