Thread (3 messages) 3 messages, 2 authors, 2018-03-12

Re: [PATCH] net/mlx4_en: Fix a memory leak in case of error in 'mlx4_en_init_netdev()'

flat view

From: Tariq Toukan <hidden>
Date: 2018-03-12 08:43:09
Also in: kernel-janitors, linux-rdma, lkml


On 12/03/2018 12:45 AM, Christophe JAILLET wrote:
quoted hunk ↗ jump to hunk
If 'kzalloc' fails, we must free some memory before returning.

Fixes: 67f8b1dcb9ee ("net/mlx4_en: Refactor the XDP forwarding rings scheme")
Signed-off-by: Christophe JAILLET <redacted>
---
  drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 8fc51bc29003..f9db018e858f 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -3327,7 +3327,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
  		if (!priv->tx_cq[t]) {
  			kfree(priv->tx_ring[t]);
  			err = -ENOMEM;
-			goto out;
+			goto err_free_tx;
  		}
  	}
  	priv->rx_ring_num = prof->rx_ring_num;
Hi Christophe, thanks for spotting this.

However, I think these err_free_tx label and loop are redundant.
Both tx_ring/tx_cq flows should just goto out, as resources are freed later in mlx4_en_destroy_netdev() -> mlx4_en_free_resources().
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help