redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ipv6: Fix using after dev_put() 

Patrick McHardy pointed it out.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Wang Chen 2008-07-14 20:54:54 -07:00 committed by David S. Miller
parent 5ae7b44413
commit 7af3db78a9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/ipv6/ip6mr.c
View File

@ -443,6 +443,7 @@ static struct net_device *ip6mr_reg_vif(void)
if (dev_open(dev)) if (dev_open(dev))
goto failure; goto failure;
dev_hold(dev);
return dev; return dev;
failure: failure:
@ -616,6 +617,7 @@ static int mif6_add(struct mif6ctl *vifc, int mrtsock)
err = dev_set_allmulti(dev, 1); err = dev_set_allmulti(dev, 1);
if (err) { if (err) {
unregister_netdevice(dev); unregister_netdevice(dev);
dev_put(dev);
return err; return err;
} }
break; break;
@ -624,10 +626,11 @@ static int mif6_add(struct mif6ctl *vifc, int mrtsock)
dev = dev_get_by_index(&init_net, vifc->mif6c_pifi); dev = dev_get_by_index(&init_net, vifc->mif6c_pifi);
if (!dev) if (!dev)
return -EADDRNOTAVAIL; return -EADDRNOTAVAIL;
dev_put(dev);
err = dev_set_allmulti(dev, 1); err = dev_set_allmulti(dev, 1);
if (err) if (err) {
dev_put(dev);
return err; return err;
}
break; break;
default: default:
return -EINVAL; return -EINVAL;
@ -651,7 +654,6 @@ static int mif6_add(struct mif6ctl *vifc, int mrtsock)
/* And finish update writing critical data */ /* And finish update writing critical data */
write_lock_bh(&mrt_lock); write_lock_bh(&mrt_lock);
dev_hold(dev);
v->dev = dev; v->dev = dev;
#ifdef CONFIG_IPV6_PIMSM_V2 #ifdef CONFIG_IPV6_PIMSM_V2
if (v->flags & MIFF_REGISTER) if (v->flags & MIFF_REGISTER)