Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e97a340 authored by Huy Nguyen's avatar Huy Nguyen Committed by David S. Miller
Browse files

net/mlx5: Fix invalid pointer reference when prof_sel parameter is invalid 



When prof_sel is invalid, mlx5_core_warn is called but the
mlx5_core_dev is not initialized yet. Solution is moving the prof_sel code
after dev->pdev assignment

Fixes: 2974ab6e ('net/mlx5: Improve driver log messages')
Signed-off-by: default avatarHuy Nguyen <huyn@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ee39fbc4

drivers/net/ethernet/mellanox/mlx5/core/main.c

+3 −2
Original line number Diff line number Diff line
@@ -1226,6 +1226,9 @@ static int init_one(struct pci_dev *pdev, 


	pci_set_drvdata(pdev, dev);



	dev->pdev = pdev;

	dev->event = mlx5_core_event;



	if (prof_sel < 0 || prof_sel >= ARRAY_SIZE(profile)) {

		mlx5_core_warn(dev,

			       "selected profile out of range, selecting default (%d)\n",
@@ -1233,8 +1236,6 @@ static int init_one(struct pci_dev *pdev, 
		prof_sel = MLX5_DEFAULT_PROF;

	}

	dev->profile = &profile[prof_sel];

	dev->pdev = pdev;

	dev->event = mlx5_core_event;



	INIT_LIST_HEAD(&priv->ctx_list);

	spin_lock_init(&priv->ctx_lock);