2020-12-28 08:51:38

by Dinghao Liu

Subject: [PATCH] [v2] net/mlx5e: Fix two double free cases

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 <[email protected]>
---

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(+)

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;
}

--
2.17.1

2020-12-28 11:17:27

by Leon Romanovsky

Subject: Re: [PATCH] [v2] net/mlx5e: Fix two double free cases

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 <[email protected]>
> ---
>
> 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 <[email protected]>

2021-01-05 23:03:52

by Saeed Mahameed

Subject: Re: [PATCH] [v2] net/mlx5e: Fix two double free cases

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 <[email protected]>
> ---
>
> Changelog:
>
> v2: - Set ft->g to NULL after kfree() instead of removing kfree().
> Refine commit message.
>

applied to net-next-mlx5,
Thanks!

2021-01-05 23:14:59

by Saeed Mahameed

Subject: Re: [PATCH] [v2] net/mlx5e: Fix two double free cases

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 <[email protected]>
> > ---
> >
> > Changelog:
> >
> > v2: - Set ft->g to NULL after kfree() instead of removing kfree().
> > Refine commit message.
> >
>
> applied to net-next-mlx5,
> Thanks!
>