Skip to content

Commit

Permalink
ipv6: Check return of dev_set_allmulti
Browse files Browse the repository at this point in the history
allmulti might overflow.
Commit: "netdevice: Fix promiscuity and allmulti overflow" in net-next makes
dev_set_promiscuity/allmulti return error number if overflow happened.

Here, we check the positive increment for allmulti to get error return.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Acked-by: Patrick McHardy <kaber@trash.net> 
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 bc3f907 commit 5ae7b44
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions net/ipv6/ip6mr.c
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,7 @@ static int mif6_add(struct mif6ctl *vifc, int mrtsock)
int vifi = vifc->mif6c_mifi;
struct mif_device *v = &vif6_table[vifi];
struct net_device *dev;
int err;

/* Is vif busy ? */
if (MIF_EXISTS(vifi))
Expand All @@ -612,20 +613,26 @@ static int mif6_add(struct mif6ctl *vifc, int mrtsock)
dev = ip6mr_reg_vif();
if (!dev)
return -ENOBUFS;
err = dev_set_allmulti(dev, 1);
if (err) {
unregister_netdevice(dev);
return err;
}
break;
#endif
case 0:
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)
return err;
break;
default:
return -EINVAL;
}

dev_set_allmulti(dev, 1);

/*
* Fill in the VIF structures
*/
Expand Down

0 comments on commit 5ae7b44

Please sign in to comment.