[net] ice: switch: fix potential memleak in ice_add_adv_recipe()

Message ID 1670225902-10923-1-git-send-email-zhangchangzhong@huawei.com
State New
Headers
Series [net] ice: switch: fix potential memleak in ice_add_adv_recipe() |

Commit Message

Zhang Changzhong Dec. 5, 2022, 7:38 a.m. UTC
  When ice_add_special_words() fails, the 'rm' is not released, which will
lead to a memory leak. Fix this up by going to 'err_unroll' label.

Compile tested only.

Fixes: 8b032a55c1bd ("ice: low level support for tunnels")
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
---
 drivers/net/ethernet/intel/ice/ice_switch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Leon Romanovsky Dec. 5, 2022, 8:20 a.m. UTC | #1
On Mon, Dec 05, 2022 at 03:38:22PM +0800, Zhang Changzhong wrote:
> When ice_add_special_words() fails, the 'rm' is not released, which will
> lead to a memory leak. Fix this up by going to 'err_unroll' label.
> 
> Compile tested only.
> 
> Fixes: 8b032a55c1bd ("ice: low level support for tunnels")
> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
> ---
>  drivers/net/ethernet/intel/ice/ice_switch.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Thanks,
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
  
Jiri Pirko Dec. 6, 2022, 1:27 p.m. UTC | #2
Mon, Dec 05, 2022 at 08:38:22AM CET, zhangchangzhong@huawei.com wrote:
>When ice_add_special_words() fails, the 'rm' is not released, which will
>lead to a memory leak. Fix this up by going to 'err_unroll' label.
>
>Compile tested only.
>
>Fixes: 8b032a55c1bd ("ice: low level support for tunnels")
>Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

Reviewed-by: Jiri Pirko <jiri@nvidia.com>
  

Patch

diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c
index 9b762f7..61f844d 100644
--- a/drivers/net/ethernet/intel/ice/ice_switch.c
+++ b/drivers/net/ethernet/intel/ice/ice_switch.c
@@ -5420,7 +5420,7 @@  ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups,
 	 */
 	status = ice_add_special_words(rinfo, lkup_exts, ice_is_dvm_ena(hw));
 	if (status)
-		goto err_free_lkup_exts;
+		goto err_unroll;
 
 	/* Group match words into recipes using preferred recipe grouping
 	 * criteria.