diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2020-04-22 12:36:41 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-04-23 12:34:43 -0700 |
| commit | c391eb8366ae052d571bb2841f1ccb4d39f3ceb8 (patch) | |
| tree | bcb1781de82c335fe3948a179f026614adfd2772 /drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c | |
| parent | net: phy: marvell10g: limit soft reset to 88x3310 (diff) | |
| download | wireguard-linux-c391eb8366ae052d571bb2841f1ccb4d39f3ceb8.tar.xz wireguard-linux-c391eb8366ae052d571bb2841f1ccb4d39f3ceb8.zip | |
mlxsw: Fix some IS_ERR() vs NULL bugs
The mlxsw_sp_acl_rulei_create() function is supposed to return an error
pointer from mlxsw_afa_block_create(). The problem is that these
functions both return NULL instead of error pointers. Half the callers
expect NULL and half expect error pointers so it could lead to a NULL
dereference on failure.
This patch changes both of them to return error pointers and changes all
the callers which checked for NULL to check for IS_ERR() instead.
Fixes: 4cda7d8d7098 ("mlxsw: core: Introduce flexible actions support")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c index 346f4a5fe053..221aa6a474eb 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c @@ -199,8 +199,8 @@ mlxsw_sp_mr_tcam_afa_block_create(struct mlxsw_sp *mlxsw_sp, int err; afa_block = mlxsw_afa_block_create(mlxsw_sp->afa); - if (!afa_block) - return ERR_PTR(-ENOMEM); + if (IS_ERR(afa_block)) + return afa_block; err = mlxsw_afa_block_append_allocated_counter(afa_block, counter_index); |