[PATCH] ipv6: fix array index in ip6_mc_add_src()

[PATCH] ipv6: fix array index in ip6_mc_add_src()

[roy.qing.li]

From: RongQing.Li <roy.qing.li@gmail.com>

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

Signed-off-by: RongQing.Li <roy.qing.li@gmail.com> 
---
 net/ipv6/mcast.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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;
 
-- 
1.7.1

Re: [PATCH] ipv6: fix array index in ip6_mc_add_src()

[David Miller]

From: roy.qing.li@gmail.com
Date: Sun,  1 Apr 2012 16:45:26 +0800

> From: RongQing.Li <roy.qing.li@gmail.com>
> 
> Convert array index from the loop bound to the loop index.
> 
> Signed-off-by: RongQing.Li <roy.qing.li@gmail.com> 

That's not all you are doing:

> -			(void) ip6_mc_del1_src(pmc, sfmode, &psfsrc[i]);
> +			ip6_mc_del1_src(pmc, sfmode, &psfsrc[j]);

You absolutely MUST mention and explain this (void) removal.
It's probably there to elide an unchecked return value
warning from the compiler.

Re: [PATCH] ipv6: fix array index in ip6_mc_add_src()

[RongQing Li]

2012/4/2 David Miller <davem@davemloft.net>:
> From: roy.qing.li@gmail.com
> Date: Sun,  1 Apr 2012 16:45:26 +0800
>
>> From: RongQing.Li <roy.qing.li@gmail.com>
>>
>> Convert array index from the loop bound to the loop index.
>>
>> Signed-off-by: RongQing.Li <roy.qing.li@gmail.com>
>
> That's not all you are doing:
>
>> -                     (void) ip6_mc_del1_src(pmc, sfmode, &psfsrc[i]);
>> +                     ip6_mc_del1_src(pmc, sfmode, &psfsrc[j]);
>
> You absolutely MUST mention and explain this (void) removal.
> It's probably there to elide an unchecked return value
> warning from the compiler.

since ip6_mc_del1_src() does not use __must_check likely attribute.
I try to compile with several gcc warning options, but do not
find which options can report the unchecked return value.

Maybe other tools will complain the unchecked return value.

So I will keep the void.

-R

Re: [PATCH] ipv6: fix array index in ip6_mc_add_src()

[David Miller]

From: RongQing Li <roy.qing.li@gmail.com>
Date: Mon, 2 Apr 2012 18:16:14 +0800

> 2012/4/2 David Miller <davem@davemloft.net>:
>> From: roy.qing.li@gmail.com
>> Date: Sun,  1 Apr 2012 16:45:26 +0800
>>
>>> From: RongQing.Li <roy.qing.li@gmail.com>
>>>
>>> Convert array index from the loop bound to the loop index.
>>>
>>> Signed-off-by: RongQing.Li <roy.qing.li@gmail.com>
>>
>> That's not all you are doing:
>>
>>> -                     (void) ip6_mc_del1_src(pmc, sfmode, &psfsrc[i]);
>>> +                     ip6_mc_del1_src(pmc, sfmode, &psfsrc[j]);
>>
>> You absolutely MUST mention and explain this (void) removal.
>> It's probably there to elide an unchecked return value
>> warning from the compiler.
> 
> since ip6_mc_del1_src() does not use __must_check likely attribute.
> I try to compile with several gcc warning options, but do not
> find which options can report the unchecked return value.

I said "probably", I didn't check myself.

The issue I had was that you didn't mention the void removal in the
commit message.

Re: [PATCH] ipv6: fix array index in ip6_mc_add_src()

[RongQing Li]

OK, I see, thanks

BR

-Roy

2012/4/3, David Miller <davem@davemloft.net>:
> From: RongQing Li <roy.qing.li@gmail.com>
> Date: Mon, 2 Apr 2012 18:16:14 +0800
>
>> 2012/4/2 David Miller <davem@davemloft.net>:
>>> From: roy.qing.li@gmail.com
>>> Date: Sun,  1 Apr 2012 16:45:26 +0800
>>>
>>>> From: RongQing.Li <roy.qing.li@gmail.com>
>>>>
>>>> Convert array index from the loop bound to the loop index.
>>>>
>>>> Signed-off-by: RongQing.Li <roy.qing.li@gmail.com>
>>>
>>> That's not all you are doing:
>>>
>>>> -                     (void) ip6_mc_del1_src(pmc, sfmode, &psfsrc[i]);
>>>> +                     ip6_mc_del1_src(pmc, sfmode, &psfsrc[j]);
>>>
>>> You absolutely MUST mention and explain this (void) removal.
>>> It's probably there to elide an unchecked return value
>>> warning from the compiler.
>>
>> since ip6_mc_del1_src() does not use __must_check likely attribute.
>> I try to compile with several gcc warning options, but do not
>> find which options can report the unchecked return value.
>
> I said "probably", I didn't check myself.
>
> The issue I had was that you didn't mention the void removal in the
> commit message.
>