Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa6a14bc authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

mlxsw: Fix some IS_ERR() vs NULL bugs 



[ Upstream commit c391eb8366ae052d571bb2841f1ccb4d39f3ceb8 ]

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: 4cda7d8d ("mlxsw: core: Introduce flexible actions support")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d5ba4c22

drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c

+2 −2
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ struct mlxsw_afa_block *mlxsw_afa_block_create(struct mlxsw_afa *mlxsw_afa) 


	block = kzalloc(sizeof(*block), GFP_KERNEL);

	if (!block)

		return NULL;

		return ERR_PTR(-ENOMEM);

	INIT_LIST_HEAD(&block->resource_list);

	block->afa = mlxsw_afa;
@@ -344,7 +344,7 @@ struct mlxsw_afa_block *mlxsw_afa_block_create(struct mlxsw_afa *mlxsw_afa) 
	mlxsw_afa_set_destroy(block->first_set);

err_first_set_create:

	kfree(block);

	return NULL;

	return ERR_PTR(-ENOMEM);

}

EXPORT_SYMBOL(mlxsw_afa_block_create);

drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ static int mlxsw_sp2_acl_tcam_init(struct mlxsw_sp *mlxsw_sp, void *priv, 
	 * to be written using PEFA register to all indexes for all regions.

	 */

	afa_block = mlxsw_afa_block_create(mlxsw_sp->afa);

	if (!afa_block) {

		err = -ENOMEM;

	if (IS_ERR(afa_block)) {

		err = PTR_ERR(afa_block);

		goto err_afa_block;

	}

	err = mlxsw_afa_block_continue(afa_block);

drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ mlxsw_sp_acl_rulei_create(struct mlxsw_sp_acl *acl, 


	rulei = kzalloc(sizeof(*rulei), GFP_KERNEL);

	if (!rulei)

		return NULL;

		return ERR_PTR(-ENOMEM);



	if (afa_block) {

		rulei->act_block = afa_block;

drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c

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