* [PATCH net-next 6/8] ipv4: Check return of dev_set_allmulti
@ 2008-06-20 0:55 Wang Chen
2008-06-20 2:09 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Wang Chen @ 2008-06-20 0:55 UTC (permalink / raw)
To: David S. Miller; +Cc: NETDEV, Patrick McHardy
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>
---
net/ipv4/ipmr.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 11700a4..2d0b92c 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,10 @@ 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);
+ /* Check whether allmulti overflow */
+ err = dev_set_allmulti(dev, 1);
+ if (err)
+ return err;
ip_rt_multicast_event(in_dev);
/*
--
1.5.3.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next 6/8] ipv4: Check return of dev_set_allmulti
2008-06-20 0:55 [PATCH net-next 6/8] ipv4: Check return of dev_set_allmulti Wang Chen
@ 2008-06-20 2:09 ` David Miller
2008-06-20 3:13 ` Wang Chen
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2008-06-20 2:09 UTC (permalink / raw)
To: wangchen; +Cc: netdev, kaber
From: Wang Chen <wangchen@cn.fujitsu.com>
Date: Fri, 20 Jun 2008 08:55:32 +0800
> @@ -435,7 +436,10 @@ 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);
> + /* Check whether allmulti overflow */
> + err = dev_set_allmulti(dev, 1);
> + if (err)
> + return err;
Please delete comment.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next 6/8] ipv4: Check return of dev_set_allmulti
2008-06-20 2:09 ` David Miller
@ 2008-06-20 3:13 ` Wang Chen
0 siblings, 0 replies; 3+ messages in thread
From: Wang Chen @ 2008-06-20 3:13 UTC (permalink / raw)
To: David Miller; +Cc: netdev, kaber
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 <wangchen@cn.fujitsu.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-06-20 3:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-20 0:55 [PATCH net-next 6/8] ipv4: Check return of dev_set_allmulti Wang Chen
2008-06-20 2:09 ` David Miller
2008-06-20 3:13 ` Wang Chen
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).