| Message ID | 20220914140100.3795545-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 46ff47bc81b4f2eaddaf5e6744f88f86c9eb7946 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [-next,v2,1/2] net/mlx5e: add missing error code in error path | expand |
On 14 Sep 22:00, Yang Yingliang wrote: >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> >--- >v2: > Replace IS_ERR_OR_NULL() check with NULL pointer check. >--- Acked-by: Saeed Mahameed <saeedm@nvidia.com> netdev maintainers please apply directly. Thanks.
Hello: This series was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Wed, 14 Sep 2022 22:00:59 +0800 you wrote: > 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> > > [...] Here is the summary with links: - [-next,v2,1/2] net/mlx5e: add missing error code in error path https://git.kernel.org/netdev/net-next/c/46ff47bc81b4 - [-next,v2,2/2] net/mlx5e: Switch to kmemdup() when allocate dev_addr https://git.kernel.org/netdev/net-next/c/13c76227cd8a You are awesome, thank you!
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;
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> --- v2: Replace IS_ERR_OR_NULL() check with NULL pointer check. --- drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)