diff options
| author |   Feras Daoud <ferasda@mellanox.com> | 2016-12-28 14:47:24 +0200 |
|---|---|---|
| committer |   Doug Ledford <dledford@redhat.com> | 2017-01-12 14:01:04 -0500 |
| commit | 89a3987ab7a923c047c6dec008e60ad6f41fac22 (patch) | |
| tree | 2e09d546359d09da9c4cac58c51e04620ecc4dbd /drivers/infiniband/ulp | |
| parent | IB/ipoib: Fix deadlock between rmmod and set_mode (diff) | |
| download | linux-dev-89a3987ab7a923c047c6dec008e60ad6f41fac22.tar.xz linux-dev-89a3987ab7a923c047c6dec008e60ad6f41fac22.zip | |
IB/ipoib: rtnl_unlock can not come after free_netdev
The ipoib_vlan_add function calls rtnl_unlock after free_netdev,
rtnl_unlock not only releases the lock, but also calls netdev_run_todo.
The latter function browses the net_todo_list array and completes the
unregistration of all its net_device instances. If we call free_netdev
before rtnl_unlock, then netdev_run_todo call over the freed device causes
panic.
To fix, move rtnl_unlock call before free_netdev call.
Fixes: 9baa0b036410 ("IB/ipoib: Add rtnl_link_ops support")
Cc: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Feras Daoud <ferasda@mellanox.com>
Signed-off-by: Erez Shitrit <erezsh@mellanox.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/ulp')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c index 96821838c352..d9dab4a109f7 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c @@ -168,11 +168,11 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey) out: up_write(&ppriv->vlan_rwsem); + rtnl_unlock(); + if (result) free_netdev(priv->dev); - rtnl_unlock(); - return result; } |