diff options
| author |   Yang Yingliang <yangyingliang@huawei.com> | 2022-09-14 22:00:59 +0800 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2022-09-19 17:58:40 -0700 |
| commit | 46ff47bc81b4f2eaddaf5e6744f88f86c9eb7946 (patch) | |
| tree | c63b13759a02cea5d2c081c23c6590701556e6a7 /drivers/net/ethernet/mellanox/mlx5/core | |
| parent | Merge branch 'standardized-ethtool-counters-for-nxp-enetc' (diff) | |
| download | linux-dev-46ff47bc81b4f2eaddaf5e6744f88f86c9eb7946.tar.xz linux-dev-46ff47bc81b4f2eaddaf5e6744f88f86c9eb7946.zip | |
net/mlx5e: add missing error code in error path
Add missing error code when mlx5e_macsec_fs_add_rule() or
mlx5e_macsec_fs_init() fails. mlx5e_macsec_fs_init() don't
return ERR_PTR(), so replace IS_ERR_OR_NULL() check with
NULL pointer check.
Fixes: e467b283ffd5 ("net/mlx5e: Add MACsec TX steering rules")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Acked-by: Saeed Mahameed <saeedm@nvidia.com>
Link: https://lore.kernel.org/r/20220914140100.3795545-1-yangyingliang@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c | 8 |
1 files changed, 6 insertions, 2 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 d9d18b039d8c..100e03eb740b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c @@ -194,8 +194,10 @@ static int mlx5e_macsec_init_sa(struct macsec_context *ctx, MLX5_ACCEL_MACSEC_ACTION_DECRYPT; macsec_rule = mlx5e_macsec_fs_add_rule(macsec->macsec_fs, ctx, &rule_attrs, &sa->fs_id); - if (IS_ERR_OR_NULL(macsec_rule)) + if (!macsec_rule) { + err = -ENOMEM; goto destroy_macsec_object; + } sa->macsec_rule = macsec_rule; @@ -1294,8 +1296,10 @@ int mlx5e_macsec_init(struct mlx5e_priv *priv) macsec->mdev = mdev; macsec_fs = mlx5e_macsec_fs_init(mdev, priv->netdev); - if (IS_ERR_OR_NULL(macsec_fs)) + if (!macsec_fs) { + err = -ENOMEM; goto err_out; + } macsec->macsec_fs = macsec_fs; |