The 'state->im' value will always be non-zero after
the 'while' statement, so the check can be removed.

Found by InfoTeCS on behalf of Linux Verification Center
(linuxtesting.org) with SVACE.

Signed-off-by: Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru>
---
 net/ipv4/igmp.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 48ff5f13e797..6ebf06886527 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -2943,8 +2943,6 @@ static struct ip_sf_list *igmp_mcf_get_next(struct seq_file *seq, struct ip_sf_l
 				continue;
 			state->im = rcu_dereference(state->idev->mc_list);
 		}
-		if (!state->im)
-			break;
 		spin_lock_bh(&state->im->lock);
 		psf = state->im->sources;
 	}
-- 
2.39.2

On 8/28/23 3:01 AM, Gavrilov Ilia wrote:
> The 'state->im' value will always be non-zero after
> the 'while' statement, so the check can be removed.
> 
> Found by InfoTeCS on behalf of Linux Verification Center
> (linuxtesting.org) with SVACE.
> 
> Signed-off-by: Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru>
> ---
>  net/ipv4/igmp.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
> index 48ff5f13e797..6ebf06886527 100644
> --- a/net/ipv4/igmp.c
> +++ b/net/ipv4/igmp.c
> @@ -2943,8 +2943,6 @@ static struct ip_sf_list *igmp_mcf_get_next(struct seq_file *seq, struct ip_sf_l
>  				continue;
>  			state->im = rcu_dereference(state->idev->mc_list);
>  		}
> -		if (!state->im)
> -			break;
>  		spin_lock_bh(&state->im->lock);
>  		psf = state->im->sources;
>  	}

Same with this one: agree the check is not needed, but I also believe it
does not need to be backported. Since net-next is closed, resubmit after
9/11.

--
pw-bot: defer

On 8/29/23 05:45, David Ahern wrote:
> On 8/28/23 3:01 AM, Gavrilov Ilia wrote:
>> The 'state->im' value will always be non-zero after
>> the 'while' statement, so the check can be removed.
>>
>> Found by InfoTeCS on behalf of Linux Verification Center
>> (linuxtesting.org) with SVACE.
>>
>> Signed-off-by: Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru>
>> ---
>>   net/ipv4/igmp.c | 2 --
>>   1 file changed, 2 deletions(-)
>>
>> diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
>> index 48ff5f13e797..6ebf06886527 100644
>> --- a/net/ipv4/igmp.c
>> +++ b/net/ipv4/igmp.c
>> @@ -2943,8 +2943,6 @@ static struct ip_sf_list *igmp_mcf_get_next(struct seq_file *seq, struct ip_sf_l
>>   				continue;
>>   			state->im = rcu_dereference(state->idev->mc_list);
>>   		}
>> -		if (!state->im)
>> -			break;
>>   		spin_lock_bh(&state->im->lock);
>>   		psf = state->im->sources;
>>   	}
> 
> Same with this one: agree the check is not needed, but I also believe it
> does not need to be backported. Since net-next is closed, resubmit after
> 9/11.
> 
> --
> pw-bot: defer

I'll resend it after 9/11.
Thank you for the review!