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: v4 [PATCH 8/9] macvlan: Check return of dev_set_allmulti
Date: Tue, 15 Jul 2008 10:59:45 +0800 [thread overview]
Message-ID: <487C12A1.6010904@cn.fujitsu.com> (raw)
In-Reply-To: <487C0ABA.1070506@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)
next prev parent reply other threads:[~2008-07-15 3:04 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <487C0ABA.1070506@cn.fujitsu.com>
2008-07-15 2:59 ` v4 [PATCH 1/9] af_packet: Check return of dev_set_promiscuity/allmulti Wang Chen
2008-07-15 3:51 ` David Miller
2008-07-15 7:52 ` [PATCH] af_packet: po->mclist needs locker in reader side(WAS: [PATCH 1/9] af_packet: Check return of dev_set_promiscuity/allmulti) Wang Chen
2008-07-15 9:11 ` [PATCH] af_packet: po->mclist needs locker in reader side David Miller
2008-07-15 10:32 ` Wang Chen
2008-07-15 2:59 ` v4 [PATCH 2/9] bonding: Check return of dev_set_promiscuity/allmulti Wang Chen
2008-07-15 3:51 ` David Miller
2008-07-15 2:59 ` v4 [PATCH 3/9] bridge: Check return of dev_set_promiscuity Wang Chen
2008-07-15 3:54 ` David Miller
2008-07-15 2:59 ` v4 [PATCH 4/9] ipv6: Check return of dev_set_allmulti Wang Chen
2008-07-15 3:54 ` David Miller
2008-07-15 2:59 ` v4 [PATCH 5/9] ipv6: Fix using after dev_put() Wang Chen
2008-07-15 3:55 ` David Miller
2008-07-15 2:59 ` v4 [PATCH 6/9] ipv4: Check return of dev_set_allmulti Wang Chen
2008-07-15 3:55 ` David Miller
2008-07-15 2:59 ` v4 [PATCH 7/9] ipv4: Fix ipmr unregister device oops Wang Chen
2008-07-15 3:56 ` David Miller
2008-07-15 2:59 ` Wang Chen [this message]
2008-07-15 3:57 ` v4 [PATCH 8/9] macvlan: Check return of dev_set_allmulti David Miller
2008-07-15 2:59 ` v4 [PATCH 9/9] 8021q: Check return of dev_set_promiscuity/allmulti Wang Chen
2008-07-15 4:00 ` David Miller
2008-07-15 6:04 ` Wang Chen
2008-07-17 5:41 ` git clone net-next-2.6 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=487C12A1.6010904@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).