From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wang Chen Subject: Re: [PATCH net-next 6/8] ipv4: Check return of dev_set_allmulti Date: Fri, 20 Jun 2008 11:13:48 +0800 Message-ID: <485B206C.6020602@cn.fujitsu.com> References: <485B0004.9020108@cn.fujitsu.com> <20080619.190921.177438602.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, kaber@trash.net To: David Miller Return-path: Received: from cn.fujitsu.com ([222.73.24.84]:57480 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1750782AbYFTDRj (ORCPT ); Thu, 19 Jun 2008 23:17:39 -0400 In-Reply-To: <20080619.190921.177438602.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org List-ID: David Miller said the following on 2008-6-20 10:09: > Please delete comment. > 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 --- net/ipv4/ipmr.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 11700a4..ba0280f 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -398,6 +398,7 @@ static int vif_add(struct vifctl *vifc, int mrtsock) struct vif_device *v = &vif_table[vifi]; struct net_device *dev; struct in_device *in_dev; + int err; /* Is vif busy ? */ if (VIF_EXISTS(vifi)) @@ -435,7 +436,9 @@ static int vif_add(struct vifctl *vifc, int mrtsock) if ((in_dev = __in_dev_get_rtnl(dev)) == NULL) return -EADDRNOTAVAIL; IPV4_DEVCONF(in_dev->cnf, MC_FORWARDING)++; - dev_set_allmulti(dev, +1); + err = dev_set_allmulti(dev, 1); + if (err) + return err; ip_rt_multicast_event(in_dev); /* -- 1.5.3.4