diff options
| author | Feras Daoud <ferasda@mellanox.com> | 2016-12-28 14:47:24 +0200 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2017-11-02 10:46:02 +0100 |
| commit | 90326945a4f4939725d32e62b8b31d0375950958 (patch) | |
| tree | da0c7c97e0d942093d426fceaa0f94014e7c3897 | |
| parent | 827a5cb0a0ad3a74426a4e0d12cbc59917785fa2 (diff) | |
| download | linux-stable-90326945a4f4939725d32e62b8b31d0375950958.tar.gz linux-stable-90326945a4f4939725d32e62b8b31d0375950958.zip | |
IB/ipoib: rtnl_unlock can not come after free_netdev
commit 89a3987ab7a923c047c6dec008e60ad6f41fac22 upstream.
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>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -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 8292554bccb5..7604ae54d7bc 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c @@ -165,11 +165,11 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey) out: mutex_unlock(&ppriv->vlan_mutex); + rtnl_unlock(); + if (result) free_netdev(priv->dev); - rtnl_unlock(); - return result; } |