Skip to content

Commit

Permalink
ipv6: Fix using after dev_put()
Browse files Browse the repository at this point in the history
Patrick McHardy pointed it out.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Wang Chen authored and David S. Miller committed Jul 15, 2008
1 parent 5ae7b44 commit 7af3db7
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions net/ipv6/ip6mr.c
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,7 @@ static struct net_device *ip6mr_reg_vif(void)
if (dev_open(dev))
goto failure;

dev_hold(dev);
return dev;

failure:
Expand Down Expand Up @@ -616,6 +617,7 @@ static int mif6_add(struct mif6ctl *vifc, int mrtsock)
err = dev_set_allmulti(dev, 1);
if (err) {
unregister_netdevice(dev);
dev_put(dev);
return err;
}
break;
Expand All @@ -624,10 +626,11 @@ static int mif6_add(struct mif6ctl *vifc, int mrtsock)
dev = dev_get_by_index(&init_net, vifc->mif6c_pifi);
if (!dev)
return -EADDRNOTAVAIL;
dev_put(dev);
err = dev_set_allmulti(dev, 1);
if (err)
if (err) {
dev_put(dev);
return err;
}
break;
default:
return -EINVAL;
Expand All @@ -651,7 +654,6 @@ static int mif6_add(struct mif6ctl *vifc, int mrtsock)

/* And finish update writing critical data */
write_lock_bh(&mrt_lock);
dev_hold(dev);
v->dev = dev;
#ifdef CONFIG_IPV6_PIMSM_V2
if (v->flags & MIFF_REGISTER)
Expand Down

0 comments on commit 7af3db7

Please sign in to comment.