Patchwork [v2] ipv6: fix array index in ip6_mc_add_src()

login
register
mail settings
Submitter roy.qing.li@gmail.com
Date April 5, 2012, 2:47 a.m.
Message ID <1333594024-24347-1-git-send-email-roy.qing.li@gmail.com>
Download mbox | patch
Permalink /patch/150842/
State Accepted
Delegated to: David Miller
Headers show

Comments

roy.qing.li@gmail.com - April 5, 2012, 2:47 a.m.
From: RongQing.Li <roy.qing.li@gmail.com>

Convert array index from the loop bound to the loop index.

And remove the void type conversion to ip6_mc_del1_src() return 
code, seem it is unnecessary, since ip6_mc_del1_src() does not 
use __must_check similar attribute, no compiler will report the
warning when it is removed.

v2: enrich the commit header

Signed-off-by: RongQing.Li <roy.qing.li@gmail.com> 
---
 net/ipv6/mcast.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
David Miller - April 5, 2012, 4:01 a.m.
From: roy.qing.li@gmail.com
Date: Thu,  5 Apr 2012 10:47:04 +0800

> From: RongQing.Li <roy.qing.li@gmail.com>
> 
> Convert array index from the loop bound to the loop index.
> 
> And remove the void type conversion to ip6_mc_del1_src() return 
> code, seem it is unnecessary, since ip6_mc_del1_src() does not 
> use __must_check similar attribute, no compiler will report the
> warning when it is removed.
> 
> v2: enrich the commit header
> 
> Signed-off-by: RongQing.Li <roy.qing.li@gmail.com> 

Applied and queued up for -stable, thank you.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 16c33e3..c6378de 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -2044,7 +2044,7 @@  static int ip6_mc_add_src(struct inet6_dev *idev, const struct in6_addr *pmca,
 		if (!delta)
 			pmc->mca_sfcount[sfmode]--;
 		for (j=0; j<i; j++)
-			(void) ip6_mc_del1_src(pmc, sfmode, &psfsrc[i]);
+			ip6_mc_del1_src(pmc, sfmode, &psfsrc[j]);
 	} else if (isexclude != (pmc->mca_sfcount[MCAST_EXCLUDE] != 0)) {
 		struct ip6_sf_list *psf;