[PATCH] mlx5: Add check for get_macsec_device()

Haoxiang Li posted 1 patch 10 months ago
drivers/infiniband/hw/mlx5/macsec.c | 5 +++++
1 file changed, 5 insertions(+)
[PATCH] mlx5: Add check for get_macsec_device()
Posted by Haoxiang Li 10 months ago
Add check for the return value of get_macsec_device() in
mlx5r_del_gid_macsec_operations() to prevent null pointer
dereference.

Fixes: 58dbd6428a68 ("RDMA/mlx5: Handles RoCE MACsec steering rules addition and deletion")
Cc: stable@vger.kernel.org
Signed-off-by: Haoxiang Li <haoxiang_li2024@163.com>
---
 drivers/infiniband/hw/mlx5/macsec.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/infiniband/hw/mlx5/macsec.c b/drivers/infiniband/hw/mlx5/macsec.c
index 3c56eb5eddf3..623b0a58f721 100644
--- a/drivers/infiniband/hw/mlx5/macsec.c
+++ b/drivers/infiniband/hw/mlx5/macsec.c
@@ -354,6 +354,11 @@ void mlx5r_del_gid_macsec_operations(const struct ib_gid_attr *attr)
 		}
 	}
 	macsec_device = get_macsec_device(ndev, &dev->macsec.macsec_devices_list);
+	if (!macsec_device) {
+		dev_put(ndev);
+		mutex_unlock(&dev->macsec.lock);
+		return;
+	}
 	mlx5_macsec_del_roce_rule(attr->index, dev->mdev->macsec_fs,
 				  &macsec_device->tx_rules_list, &macsec_device->rx_rules_list);
 	mlx5_macsec_del_roce_gid(macsec_device, attr->index);
-- 
2.25.1
Re: [PATCH] mlx5: Add check for get_macsec_device()
Posted by Leon Romanovsky 10 months ago
On Tue, Feb 18, 2025 at 06:02:00PM +0800, Haoxiang Li wrote:
> Add check for the return value of get_macsec_device() in
> mlx5r_del_gid_macsec_operations() to prevent null pointer
> dereference.
> 
> Fixes: 58dbd6428a68 ("RDMA/mlx5: Handles RoCE MACsec steering rules addition and deletion")
> Cc: stable@vger.kernel.org

Definitely not.

> Signed-off-by: Haoxiang Li <haoxiang_li2024@163.com>
> ---
>  drivers/infiniband/hw/mlx5/macsec.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/infiniband/hw/mlx5/macsec.c b/drivers/infiniband/hw/mlx5/macsec.c
> index 3c56eb5eddf3..623b0a58f721 100644
> --- a/drivers/infiniband/hw/mlx5/macsec.c
> +++ b/drivers/infiniband/hw/mlx5/macsec.c
> @@ -354,6 +354,11 @@ void mlx5r_del_gid_macsec_operations(const struct ib_gid_attr *attr)
>  		}
>  	}
>  	macsec_device = get_macsec_device(ndev, &dev->macsec.macsec_devices_list);

At this stage macsec_device is valid.

> +	if (!macsec_device) {
> +		dev_put(ndev);
> +		mutex_unlock(&dev->macsec.lock);
> +		return;
> +	}
>  	mlx5_macsec_del_roce_rule(attr->index, dev->mdev->macsec_fs,
>  				  &macsec_device->tx_rules_list, &macsec_device->rx_rules_list);
>  	mlx5_macsec_del_roce_gid(macsec_device, attr->index);
> -- 
> 2.25.1
>