netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Wang Chen <wangchen@cn.fujitsu.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: Patrick McHardy <kaber@trash.net>,
	NETDEV <netdev@vger.kernel.org>,
	YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Subject: v3 [PATCH net-next 4/7] ipv6: Check return of dev_set_allmulti
Date: Wed, 02 Jul 2008 16:17:26 +0800	[thread overview]
Message-ID: <486B3996.8000201@cn.fujitsu.com> (raw)
In-Reply-To: <4869FB47.6080502@trash.net>

v2->v3:
  Do unwind job when error happen.

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>
---
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 1479618..ba763b8 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -461,6 +461,13 @@ failure:
 	unregister_netdevice(dev);
 	return NULL;
 }
+
+static void ip6mr_unreg_vif(struct net_device *dev)
+{
+	dev_close(dev);
+	unregister_netdevice(dev);
+	free_netdev(dev);
+}
 #endif
 
 /*
@@ -603,6 +610,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 +628,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) {
+			ip6mr_unreg_vif(dev);
+			return err;
+		}
 		break;
 #endif
 	case 0:
@@ -627,13 +640,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
 	 */


  parent reply	other threads:[~2008-07-02  8:22 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-01  3:19 [PATCH net-next 0/7] Check return of dev_set_promiscuity/allmulti Wang Chen
2008-07-01  3:21 ` v2 [PATCH net-next 1/8] af_packet: " Wang Chen
2008-07-01  3:31   ` Wang Chen
2008-07-02  2:56     ` David Miller
2008-07-01  9:36   ` Patrick McHardy
2008-07-01  9:42     ` Wang Chen
2008-07-02  8:12     ` v3 [PATCH net-next 1/7] " Wang Chen
2008-07-02 12:53       ` Patrick McHardy
2008-07-01  3:23 ` v2 [PATCH net-next 2/7] bonding: " Wang Chen
2008-07-02  8:15   ` Wang Chen
2008-07-01  3:25 ` v2 [PATCH net-next 3/7] bridge: Check return of dev_set_promiscuity Wang Chen
2008-07-02  8:15   ` Wang Chen
2008-07-01  3:26 ` v2 [PATCH net-next 4/7] ipv6: Check return of dev_set_allmulti Wang Chen
2008-07-01  9:39   ` Patrick McHardy
2008-07-01  9:44     ` Wang Chen
2008-07-02  8:17     ` Wang Chen [this message]
2008-07-02 12:54       ` v3 " Patrick McHardy
2008-07-03  3:23         ` v4 " Wang Chen
2008-07-01  3:27 ` v2 [PATCH net-next 5/7] ipv4: " Wang Chen
2008-07-01  9:40   ` Patrick McHardy
2008-07-01  9:49     ` Wang Chen
2008-07-01  9:57       ` Patrick McHardy
2008-07-02  8:24     ` v3 " Wang Chen
2008-07-02 12:55       ` Patrick McHardy
2008-07-03  3:25         ` v4 " Wang Chen
2008-07-03  4:13           ` David Miller
2008-07-01  3:28 ` v2 [PATCH net-next 6/7] macvlan: " Wang Chen
2008-07-01  3:30 ` v2 [PATCH net-next 7/7] 8021q: Check return of dev_set_promiscuity/allmulti Wang Chen
  -- strict thread matches above, loose matches on Subject: below --
2008-07-07  2:31 v3 [PATCH net-next 0/7] " Wang Chen
2008-07-07  2:36 ` v3 [PATCH net-next 4/7] ipv6: Check return of dev_set_allmulti Wang Chen
2008-07-07 11:20   ` Patrick McHardy
2008-07-07 13:17     ` Wang Chen
2008-07-07 13:26       ` Patrick McHardy
2008-07-07 14:45         ` Wang Chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=486B3996.8000201@cn.fujitsu.com \
    --to=wangchen@cn.fujitsu.com \
    --cc=davem@davemloft.net \
    --cc=kaber@trash.net \
    --cc=netdev@vger.kernel.org \
    --cc=yoshfuji@linux-ipv6.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).