net/mlx5: Fix memory leak in error flow of port set buffer

In the cited commit, shared buffer updates were added whenever
port buffer gets updated.

However, in case the shared buffer update fails, exiting early from
port_set_buffer() is performed without freeing previously-allocated memory.

Fix it by jumping to out label where memory is freed before returning
with error.

Fixes: a440030d8946 ("net/mlx5e: Update shared buffer along with device buffer changes")
Signed-off-by: Maher Sanalla <msanalla@nvidia.com>
Reviewed-by: Moshe Shemesh <moshe@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c b/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c
index 57f4b1b50421b15efce67a79cc6a24a3ba5aed49..7ac1ad9c46de0352a0a323f815f8a0b28f2281d2 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c
@@ -314,11 +314,11 @@ static int port_set_buffer(struct mlx5e_priv *priv,
        err = port_update_shared_buffer(priv->mdev, current_headroom_size,
                                        new_headroom_size);
        if (err)
-               return err;
+               goto out;
 
        err = port_update_pool_cfg(priv->mdev, port_buffer);
        if (err)
-               return err;
+               goto out;
 
        err = mlx5e_port_set_pbmc(mdev, in);
 out: