Unverified Commit 835ce211 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4701 v2 mlxsw: spectrum_acl_tcam: Fix NULL pointer dereference in error path 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XGDCURVEKN6AFHZ6WPORKERZVYETBKGH/ 
 
https://gitee.com/src-openeuler/kernel/issues/I93EE7 
 
Link:https://gitee.com/openeuler/kernel/pulls/4701

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents c297b424 dc7fac75

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+1 −0
Original line number Diff line number Diff line
@@ -491,6 +491,7 @@ enum mlxsw_sp_acl_profile { 
};



struct mlxsw_afk *mlxsw_sp_acl_afk(struct mlxsw_sp_acl *acl);

struct mlxsw_sp_acl_tcam *mlxsw_sp_acl_to_tcam(struct mlxsw_sp_acl *acl);

struct mlxsw_sp *mlxsw_sp_acl_block_mlxsw_sp(struct mlxsw_sp_acl_block *block);

unsigned int mlxsw_sp_acl_block_rule_count(struct mlxsw_sp_acl_block *block);

void mlxsw_sp_acl_block_disable_inc(struct mlxsw_sp_acl_block *block);

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

+5 −0
Original line number Diff line number Diff line
@@ -38,6 +38,11 @@ struct mlxsw_afk *mlxsw_sp_acl_afk(struct mlxsw_sp_acl *acl) 
	return acl->afk;

}



struct mlxsw_sp_acl_tcam *mlxsw_sp_acl_to_tcam(struct mlxsw_sp_acl *acl)

{

	return &acl->tcam;

}



struct mlxsw_sp_acl_block_binding {

	struct list_head list;

	struct net_device *dev;

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

+2 −1
Original line number Diff line number Diff line
@@ -571,12 +571,13 @@ static void 
mlxsw_sp_acl_tcam_region_destroy(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_acl_tcam_region *region)

{

	struct mlxsw_sp_acl_tcam *tcam = mlxsw_sp_acl_to_tcam(mlxsw_sp->acl);

	const struct mlxsw_sp_acl_tcam_ops *ops = mlxsw_sp->acl_tcam_ops;



	ops->region_fini(mlxsw_sp, region->priv);

	mlxsw_sp_acl_tcam_region_disable(mlxsw_sp, region);

	mlxsw_sp_acl_tcam_region_free(mlxsw_sp, region);

	mlxsw_sp_acl_tcam_region_id_put(region->group->tcam, region->id);

	mlxsw_sp_acl_tcam_region_id_put(tcam, region->id);

	mlxsw_afk_key_info_put(region->key_info);

	kfree(region);

}