| Message ID | 20201228084840.5013-1-dinghao.liu@zju.edu.cn (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2] net/mlx5e: Fix two double free cases | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | success | CCed 9 of 9 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 2 this patch: 2 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 14 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On Mon, Dec 28, 2020 at 04:48:40PM +0800, Dinghao Liu wrote: > mlx5e_create_ttc_table_groups() frees ft->g on failure of > kvzalloc(), but such failure will be caught by its caller > in mlx5e_create_ttc_table() and ft->g will be freed again > in mlx5e_destroy_flow_table(). The same issue also occurs > in mlx5e_create_ttc_table_groups(). Set ft->g to NULL after > kfree() to avoid double free. > > Fixes: 7b3722fa9ef64 ("net/mlx5e: Support RSS for GRE tunneled packets") > Fixes: 33cfaaa8f36ff ("net/mlx5e: Split the main flow steering table") > Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> > --- > > Changelog: > > v2: - Set ft->g to NULL after kfree() instead of removing kfree(). > Refine commit message. > --- > drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 2 ++ > 1 file changed, 2 insertions(+) > Thanks, Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
On Mon, 2020-12-28 at 16:48 +0800, Dinghao Liu wrote: > mlx5e_create_ttc_table_groups() frees ft->g on failure of > kvzalloc(), but such failure will be caught by its caller > in mlx5e_create_ttc_table() and ft->g will be freed again > in mlx5e_destroy_flow_table(). The same issue also occurs > in mlx5e_create_ttc_table_groups(). Set ft->g to NULL after > kfree() to avoid double free. > > Fixes: 7b3722fa9ef64 ("net/mlx5e: Support RSS for GRE tunneled > packets") > Fixes: 33cfaaa8f36ff ("net/mlx5e: Split the main flow steering > table") > Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> > --- > > Changelog: > > v2: - Set ft->g to NULL after kfree() instead of removing kfree(). > Refine commit message. > applied to net-next-mlx5, Thanks!
On Tue, 2021-01-05 at 13:02 -0800, Saeed Mahameed wrote: > On Mon, 2020-12-28 at 16:48 +0800, Dinghao Liu wrote: > > mlx5e_create_ttc_table_groups() frees ft->g on failure of > > kvzalloc(), but such failure will be caught by its caller > > in mlx5e_create_ttc_table() and ft->g will be freed again > > in mlx5e_destroy_flow_table(). The same issue also occurs > > in mlx5e_create_ttc_table_groups(). Set ft->g to NULL after > > kfree() to avoid double free. > > > > Fixes: 7b3722fa9ef64 ("net/mlx5e: Support RSS for GRE tunneled ^ this is one digit too much.. Fixes line must start with a 12 char SHA and not 13 :). I fixed this up, no need to do anything but just FYI. > > packets") > > Fixes: 33cfaaa8f36ff ("net/mlx5e: Split the main flow steering > > table") > > Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> > > --- > > > > Changelog: > > > > v2: - Set ft->g to NULL after kfree() instead of removing kfree(). > > Refine commit message. > > > > applied to net-next-mlx5, > Thanks! >
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c index fa8149f6eb08..44a2dfbc3853 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c @@ -942,6 +942,7 @@ static int mlx5e_create_ttc_table_groups(struct mlx5e_ttc_table *ttc, in = kvzalloc(inlen, GFP_KERNEL); if (!in) { kfree(ft->g); + ft->g = NULL; return -ENOMEM; } @@ -1087,6 +1088,7 @@ static int mlx5e_create_inner_ttc_table_groups(struct mlx5e_ttc_table *ttc) in = kvzalloc(inlen, GFP_KERNEL); if (!in) { kfree(ft->g); + ft->g = NULL; return -ENOMEM; }
mlx5e_create_ttc_table_groups() frees ft->g on failure of kvzalloc(), but such failure will be caught by its caller in mlx5e_create_ttc_table() and ft->g will be freed again in mlx5e_destroy_flow_table(). The same issue also occurs in mlx5e_create_ttc_table_groups(). Set ft->g to NULL after kfree() to avoid double free. Fixes: 7b3722fa9ef64 ("net/mlx5e: Support RSS for GRE tunneled packets") Fixes: 33cfaaa8f36ff ("net/mlx5e: Split the main flow steering table") Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> --- Changelog: v2: - Set ft->g to NULL after kfree() instead of removing kfree(). Refine commit message. --- drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 2 ++ 1 file changed, 2 insertions(+)