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>
Subject: v3 [PATCH net-next 6/7] macvlan: Check return of dev_set_allmulti
Date: Mon, 07 Jul 2008 10:38:24 +0800	[thread overview]
Message-ID: <487181A0.7070202@cn.fujitsu.com> (raw)
In-Reply-To: <48718014.4030009@cn.fujitsu.com>

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>
---
 drivers/net/macvlan.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index c36a03a..a857330 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -189,12 +189,20 @@ static int macvlan_open(struct net_device *dev)
 
 	err = dev_unicast_add(lowerdev, dev->dev_addr, ETH_ALEN);
 	if (err < 0)
-		return err;
-	if (dev->flags & IFF_ALLMULTI)
-		dev_set_allmulti(lowerdev, 1);
+		goto out;
+	if (dev->flags & IFF_ALLMULTI) {
+		err = dev_set_allmulti(lowerdev, 1);
+		if (err < 0)
+			goto del_unicast;
+	}
 
 	hlist_add_head_rcu(&vlan->hlist, &port->vlan_hash[dev->dev_addr[5]]);
 	return 0;
+
+del_unicast:
+	dev_unicast_delete(lowerdev, dev->dev_addr, ETH_ALEN);
+out:
+	return err;
 }
 
 static int macvlan_stop(struct net_device *dev)



  parent reply	other threads:[~2008-07-07  2:43 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-07  2:31 v3 [PATCH net-next 0/7] Check return of dev_set_promiscuity/allmulti Wang Chen
2008-07-07  2:33 ` v3 [PATCH net-next 1/7] af_packet: " Wang Chen
2008-07-07  2:34 ` v3 [PATCH net-next 2/7] bonding: " Wang Chen
2008-07-07  2:35 ` v3 [PATCH net-next 3/7] bridge: Check return of dev_set_promiscuity 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
2008-07-07  2:37 ` v3 [PATCH net-next 5/7] ipv4: " Wang Chen
2008-07-07 11:22   ` Patrick McHardy
2008-07-08  9:34     ` Wang Chen
2008-07-14  1:14       ` Wang Chen
2008-07-08  9:41     ` Wang Chen
2008-07-14  1:05       ` Wang Chen
2008-07-07  2:38 ` Wang Chen [this message]
2008-07-07  2:38 ` v3 [PATCH net-next 7/7] 8021q: Check return of dev_set_promiscuity/allmulti 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=487181A0.7070202@cn.fujitsu.com \
    --to=wangchen@cn.fujitsu.com \
    --cc=davem@davemloft.net \
    --cc=kaber@trash.net \
    --cc=netdev@vger.kernel.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).