Skip to content

Commit

Permalink
IB/ipoib: Fix memory leaks for child interfaces priv
Browse files Browse the repository at this point in the history
There is a need to free priv explicitly and not just to release
the device, child priv is freed explicitly on remove flow and this
patch also includes priv free on error flow in P_key creation
and also in add_port.

Fixes: cd565b4 ('IB/IPoIB: Support acceleration options callbacks')
Signed-off-by: Alex Vesker <valex@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
  • Loading branch information
Alex Vesker authored and Doug Ledford committed Jun 14, 2017
1 parent 07d432b commit ab156af
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
7 changes: 6 additions & 1 deletion drivers/infiniband/ulp/ipoib/ipoib_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2237,6 +2237,7 @@ static struct net_device *ipoib_add_port(const char *format,

device_init_failed:
free_netdev(priv->dev);
kfree(priv);

alloc_mem_failed:
return ERR_PTR(result);
Expand Down Expand Up @@ -2277,7 +2278,7 @@ static void ipoib_add_one(struct ib_device *device)

static void ipoib_remove_one(struct ib_device *device, void *client_data)
{
struct ipoib_dev_priv *priv, *tmp;
struct ipoib_dev_priv *priv, *tmp, *cpriv, *tcpriv;
struct list_head *dev_list = client_data;

if (!dev_list)
Expand All @@ -2301,6 +2302,10 @@ static void ipoib_remove_one(struct ib_device *device, void *client_data)

unregister_netdev(priv->dev);
free_netdev(priv->dev);

list_for_each_entry_safe(cpriv, tcpriv, &priv->child_intfs, list)
kfree(cpriv);

kfree(priv);
}

Expand Down
5 changes: 4 additions & 1 deletion drivers/infiniband/ulp/ipoib/ipoib_vlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,10 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)

rtnl_unlock();

if (result)
if (result) {
free_netdev(priv->dev);
kfree(priv);
}

return result;
}
Expand Down Expand Up @@ -209,6 +211,7 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)

if (dev) {
free_netdev(dev);
kfree(priv);
return 0;
}

Expand Down

0 comments on commit ab156af

Please sign in to comment.