[PATCH net] ibmvnic: Fix returning uninitialized return code

[PATCH net] ibmvnic: Fix returning uninitialized return code

[Thomas Falcon]

If successful, __ibmvnic_open and reset_sub_crq_queues,
if no device queues exist, will return an uninitialized
variable rc. Return zero on success instead.

Fixes: 57a49436f4e8 ("ibmvnic: Reset sub-crqs during driver reset")
Fixes: ed651a10875f ("ibmvnic: Updated reset handling")
Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com>
---
 drivers/net/ethernet/ibm/ibmvnic.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 1b702a4..1619311 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1178,7 +1178,7 @@ static int __ibmvnic_open(struct net_device *netdev)
 	}
 
 	adapter->state = VNIC_OPEN;
-	return rc;
+	return 0;
 }
 
 static int ibmvnic_open(struct net_device *netdev)
@@ -2862,7 +2862,7 @@ static int reset_sub_crq_queues(struct ibmvnic_adapter *adapter)
 			return rc;
 	}
 
-	return rc;
+	return 0;
 }
 
 static void release_sub_crq_queue(struct ibmvnic_adapter *adapter,
-- 
1.8.3.1

Re: [PATCH net] ibmvnic: Fix returning uninitialized return code

[Saeed Mahameed]

On Wed, 2020-09-16 at 17:12 -0500, Thomas Falcon wrote:
> If successful, __ibmvnic_open and reset_sub_crq_queues,
> if no device queues exist, will return an uninitialized
> variable rc. Return zero on success instead.
> 
> Fixes: 57a49436f4e8 ("ibmvnic: Reset sub-crqs during driver reset")
> Fixes: ed651a10875f ("ibmvnic: Updated reset handling")
> Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com>
> ---
>  drivers/net/ethernet/ibm/ibmvnic.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/ibm/ibmvnic.c
> b/drivers/net/ethernet/ibm/ibmvnic.c
> index 1b702a4..1619311 100644
> --- a/drivers/net/ethernet/ibm/ibmvnic.c
> +++ b/drivers/net/ethernet/ibm/ibmvnic.c
> @@ -1178,7 +1178,7 @@ static int __ibmvnic_open(struct net_device
> *netdev)
>  	}
>  
>  	adapter->state = VNIC_OPEN;
> -	return rc;
> +	return 0;

rc here is unconditionally assigned a couple of lines earlier, 
but anyway i don't mind this change as it explicitly states that this
is a success path.

But maybe you want to split the patch and send this hunk to net-next.
I don't mind, up to you.

>  }
>  
>  static int ibmvnic_open(struct net_device *netdev)
> @@ -2862,7 +2862,7 @@ static int reset_sub_crq_queues(struct
> ibmvnic_adapter *adapter)
>  			return rc;
>  	}
>  
> -	return rc;
> +	return 0;

This one though is fine,

Reviewed-by: Saeed Mahameed <saeedm@nvidia.com>

Re: [PATCH net] ibmvnic: Fix returning uninitialized return code

[Thomas Falcon]

On 9/17/20 1:07 AM, Saeed Mahameed wrote:
> On Wed, 2020-09-16 at 17:12 -0500, Thomas Falcon wrote:
>> If successful, __ibmvnic_open and reset_sub_crq_queues,
>> if no device queues exist, will return an uninitialized
>> variable rc. Return zero on success instead.
>>
>> Fixes: 57a49436f4e8 ("ibmvnic: Reset sub-crqs during driver reset")
>> Fixes: ed651a10875f ("ibmvnic: Updated reset handling")
>> Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com>
>> ---
>>   drivers/net/ethernet/ibm/ibmvnic.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/ibm/ibmvnic.c
>> b/drivers/net/ethernet/ibm/ibmvnic.c
>> index 1b702a4..1619311 100644
>> --- a/drivers/net/ethernet/ibm/ibmvnic.c
>> +++ b/drivers/net/ethernet/ibm/ibmvnic.c
>> @@ -1178,7 +1178,7 @@ static int __ibmvnic_open(struct net_device
>> *netdev)
>>   	}
>>   
>>   	adapter->state = VNIC_OPEN;
>> -	return rc;
>> +	return 0;
> rc here is unconditionally assigned a couple of lines earlier,
> but anyway i don't mind this change as it explicitly states that this
> is a success path.
>
> But maybe you want to split the patch and send this hunk to net-next.
> I don't mind, up to you.

Thanks for catching that, I'll send a v2 with just the second hunk.

Tom

>
>>   }
>>   
>>   static int ibmvnic_open(struct net_device *netdev)
>> @@ -2862,7 +2862,7 @@ static int reset_sub_crq_queues(struct
>> ibmvnic_adapter *adapter)
>>   			return rc;
>>   	}
>>   
>> -	return rc;
>> +	return 0;
> This one though is fine,
>
> Reviewed-by: Saeed Mahameed <saeedm@nvidia.com>
>
>