| Message ID | 20161227133911.14340-6-leon@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com> On Tue, Dec 27, 2016 at 03:39:07PM +0200, Leon Romanovsky wrote: > From: Feras Daoud <ferasda@mellanox.com> > > 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> > Signed-off-by: Leon Romanovsky <leon@kernel.org> > --- > drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c > index 9682183..d9dab4a 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; > } > > -- > 2.10.2 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c index 9682183..d9dab4a 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; }