From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 25 Aug 2022 23:07:42 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=880b0dd94f0399cf772a8582e7b5a47f180c8618;p=linux.git

Merge git://git./linux/kernel/git/netdev/net

drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
  21234e3a84c7 ("net/mlx5e: Fix use after free in mlx5e_fs_init()")
  c7eafc5ed068 ("net/mlx5e: Convert ethtool_steering member of flow_steering struct to pointer")
https://lore.kernel.org/all/20220825104410.67d4709c@canb.auug.org.au/
https://lore.kernel.org/all/20220823055533.334471-1-saeed@kernel.org/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

880b0dd94f0399cf772a8582e7b5a47f180c8618
diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
index ef1dfbb78464a,e0ce5a233d0b4..1892ccb889b3f
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
@@@ -1454,17 -1394,12 +1454,17 @@@ struct mlx5e_flow_steering *mlx5e_fs_in
  			goto err_free_vlan;
  	}
  
 -	return fs;
 +	err = mlx5e_fs_ethtool_alloc(fs);
 +	if (err)
 +		goto err_free_tc;
  
 +	return fs;
 +err_free_tc:
 +	mlx5e_fs_tc_free(fs);
- err_free_fs:
- 	kvfree(fs);
  err_free_vlan:
  	mlx5e_fs_vlan_free(fs);
+ err_free_fs:
+ 	kvfree(fs);
  err:
  	return NULL;
  }