Re: [PATCH 6.1] mlxsw: spectrum_acl_tcam: Fix NULL pointer dereference in error path

[Sasha Levin <sashal@kernel.org>]

[ Sasha's backport helper bot ]

Hi,

The upstream commit SHA1 provided is correct: efeb7dfea8ee10cdec11b6b6ba4e405edbe75809

WARNING: Author mismatch between patch and upstream commit:
Backport author: Bin Lan <bin.lan.cn@windriver.com>
Commit author: Ido Schimmel <idosch@nvidia.com>


Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.11.y | Present (exact SHA1)
6.6.y | Present (different SHA1: 817840d125a3)
6.1.y | Not found

Note: The patch differs from the upstream commit:
---
--- -	2024-11-28 06:27:54.820071472 -0500
+++ /tmp/tmp.TYWoQ2w0cN	2024-11-28 06:27:54.814129152 -0500
@@ -1,3 +1,5 @@
+[ Upstream commit efeb7dfea8ee10cdec11b6b6ba4e405edbe75809 ]
+
 When calling mlxsw_sp_acl_tcam_region_destroy() from an error path after
 failing to attach the region to an ACL group, we hit a NULL pointer
 dereference upon 'region->group->tcam' [1].
@@ -36,15 +38,48 @@
 Acked-by: Paolo Abeni <pabeni@redhat.com>
 Link: https://lore.kernel.org/r/fb6a4542bbc9fcab5a523802d97059bffbca7126.1705502064.git.petrm@nvidia.com
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+[ For the function mlxsw_sp_acl_to_tcam() is not exist in 6.1.y, pick
+mlxsw_sp_acl_to_tcam() from commit 74cbc3c03c828ccf265a72f9bcb5aee906978744 ]
+Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
 ---
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h          | 1 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c      | 5 +++++
  drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ 3 files changed, 8 insertions(+), 2 deletions(-)
 
+diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+index c8ff2a6d7e90..57ab91133774 100644
+--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
++++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+@@ -970,6 +970,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);
+ 
+ int mlxsw_sp_acl_ruleset_bind(struct mlxsw_sp *mlxsw_sp,
+ 			      struct mlxsw_sp_flow_block *block,
+diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
+index 6c5af018546f..93b71106b4c5 100644
+--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
++++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
+@@ -40,6 +40,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_ruleset_ht_key {
+ 	struct mlxsw_sp_flow_block *block;
+ 	u32 chain_index;
 diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
-index d50786b0a6ce4..7d1e91196e943 100644
+index 685bcf8cbfa9..6796edb24951 100644
 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
 +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
-@@ -681,13 +681,13 @@ static void
+@@ -747,13 +747,13 @@ static void
  mlxsw_sp_acl_tcam_region_destroy(struct mlxsw_sp *mlxsw_sp,
  				 struct mlxsw_sp_acl_tcam_region *region)
  {
@@ -60,3 +95,6 @@
  	kfree(region);
  }
  
+-- 
+2.34.1
+
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y        |  Success    |  Success   |