| Message ID | 20230630012647.1078002-1-shaozhengchao@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 08fc75735fda3be97194bfbf3c899c87abb3d0fe |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [RESEND,net,v2] mlxsw: minimal: fix potential memory leak in mlxsw_m_linecards_init | expand |
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Fri, 30 Jun 2023 09:26:47 +0800 you wrote: > The line cards array is not freed in the error path of > mlxsw_m_linecards_init(), which can lead to a memory leak. Fix by > freeing the array in the error path, thereby making the error path > identical to mlxsw_m_linecards_fini(). > > Fixes: 01328e23a476 ("mlxsw: minimal: Extend module to port mapping with slot index") > Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com> > Reviewed-by: Petr Machata <petrm@nvidia.com> > Reviewed-by: Ido Schimmel <idosch@nvidia.com> > > [...] Here is the summary with links: - [RESEND,net,v2] mlxsw: minimal: fix potential memory leak in mlxsw_m_linecards_init https://git.kernel.org/netdev/net/c/08fc75735fda You are awesome, thank you!
diff --git a/drivers/net/ethernet/mellanox/mlxsw/minimal.c b/drivers/net/ethernet/mellanox/mlxsw/minimal.c index 6b56eadd736e..6b98c3287b49 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/minimal.c +++ b/drivers/net/ethernet/mellanox/mlxsw/minimal.c @@ -417,6 +417,7 @@ static int mlxsw_m_linecards_init(struct mlxsw_m *mlxsw_m) err_kmalloc_array: for (i--; i >= 0; i--) kfree(mlxsw_m->line_cards[i]); + kfree(mlxsw_m->line_cards); err_kcalloc: kfree(mlxsw_m->ports); return err;
The line cards array is not freed in the error path of mlxsw_m_linecards_init(), which can lead to a memory leak. Fix by freeing the array in the error path, thereby making the error path identical to mlxsw_m_linecards_fini(). Fixes: 01328e23a476 ("mlxsw: minimal: Extend module to port mapping with slot index") Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com> Reviewed-by: Petr Machata <petrm@nvidia.com> Reviewed-by: Ido Schimmel <idosch@nvidia.com> --- v2: modify commit message. --- drivers/net/ethernet/mellanox/mlxsw/minimal.c | 1 + 1 file changed, 1 insertion(+)