forked from Minki/linux
IB/ipoib: Fix memory leaks for child interfaces priv
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: cd565b4b51
('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>
This commit is contained in:
parent
07d432bb97
commit
ab156afd3e
@ -2237,6 +2237,7 @@ event_failed:
|
||||
|
||||
device_init_failed:
|
||||
free_netdev(priv->dev);
|
||||
kfree(priv);
|
||||
|
||||
alloc_mem_failed:
|
||||
return ERR_PTR(result);
|
||||
@ -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)
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
@ -167,8 +167,10 @@ out:
|
||||
|
||||
rtnl_unlock();
|
||||
|
||||
if (result)
|
||||
if (result) {
|
||||
free_netdev(priv->dev);
|
||||
kfree(priv);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
@ -209,6 +211,7 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
|
||||
|
||||
if (dev) {
|
||||
free_netdev(dev);
|
||||
kfree(priv);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user