Commit 46ff47bc authored by Yang Yingliang's avatar Yang Yingliang Committed by Jakub Kicinski
Browse files

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: e467b283 ("net/mlx5e: Add MACsec TX steering rules")
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Acked-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Link: https://lore.kernel.org/r/20220914140100.3795545-1-yangyingliang@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f3dcb3ed

drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c

+6 −2
Original line number Diff line number Diff line
@@ -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;