Skip to content

Commit

Permalink
net/mlx5e: Cleanup MACsec uninitialization routine
Browse files Browse the repository at this point in the history
The mlx5e_macsec_cleanup() routine has NULL pointer dereferencing if mlx5
device doesn't support MACsec (priv->macsec will be NULL).

While at it delete comment line, assignment and extra blank lines, so fix
everything in one patch.

Fixes: 1f53da6 ("net/mlx5e: Create advanced steering operation (ASO) object for MACsec")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
rleon authored and davem330 committed Oct 24, 2022
1 parent 6960d13 commit f812747
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1846,25 +1846,16 @@ int mlx5e_macsec_init(struct mlx5e_priv *priv)
void mlx5e_macsec_cleanup(struct mlx5e_priv *priv)
{
struct mlx5e_macsec *macsec = priv->macsec;
struct mlx5_core_dev *mdev = macsec->mdev;
struct mlx5_core_dev *mdev = priv->mdev;

if (!macsec)
return;

mlx5_notifier_unregister(mdev, &macsec->nb);

mlx5e_macsec_fs_cleanup(macsec->macsec_fs);

/* Cleanup workqueue */
destroy_workqueue(macsec->wq);

mlx5e_macsec_aso_cleanup(&macsec->aso, mdev);

priv->macsec = NULL;

rhashtable_destroy(&macsec->sci_hash);

mutex_destroy(&macsec->lock);

kfree(macsec);
}

0 comments on commit f812747

Please sign in to comment.