From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wang Chen Subject: v4 [PATCH 4/9] ipv6: Check return of dev_set_allmulti Date: Tue, 15 Jul 2008 10:59:25 +0800 Message-ID: <487C128D.4070605@cn.fujitsu.com> References: <487C0ABA.1070506@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: Patrick McHardy , NETDEV , YOSHIFUJI Hideaki To: "David S. Miller" Return-path: Received: from cn.fujitsu.com ([222.73.24.84]:55992 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755138AbYGODE2 (ORCPT ); Mon, 14 Jul 2008 23:04:28 -0400 In-Reply-To: <487C0ABA.1070506@cn.fujitsu.com> Sender: netdev-owner@vger.kernel.org List-ID: 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 Acked-by: Patrick McHardy --- diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 1479618..6cd286d 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -603,6 +603,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)) @@ -620,6 +621,11 @@ 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: @@ -627,13 +633,14 @@ static int mif6_add(struct mif6ctl *vifc, int mrtsock) 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 */