[PATCH 0/2] iio: bmi323: Fix some bugs in suspend resume

[PATCH 0/2] iio: bmi323: Fix some bugs in suspend resume

[Dan Carpenter]

These were a couple bugs I found using static analysis.  I have not tested
this code.

Dan Carpenter (2):
  iio: bmi323: fix copy and paste bugs in suspend resume
  iio: bmi323: fix reversed if statement in bmi323_core_runtime_resume()

 drivers/iio/imu/bmi323/bmi323_core.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

-- 
2.45.2

[PATCH 1/2] iio: bmi323: fix copy and paste bugs in suspend resume

[Dan Carpenter]

This code is using bmi323_reg_savestate[] and ->reg_settings[] instead
of bmi323_ext_reg_savestate[] and ->ext_reg_settings[].  This was
discovered by Smatch:

    drivers/iio/imu/bmi323/bmi323_core.c:2202 bmi323_core_runtime_suspend()
    error: buffer overflow 'bmi323_reg_savestate' 9 <= 11

Fixes: 16531118ba63 ("iio: bmi323: peripheral in lowest power state on suspend")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
From static analysis.  Not tested.

 drivers/iio/imu/bmi323/bmi323_core.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/iio/imu/bmi323/bmi323_core.c b/drivers/iio/imu/bmi323/bmi323_core.c
index 671401ce80dc..d415b6542089 100644
--- a/drivers/iio/imu/bmi323/bmi323_core.c
+++ b/drivers/iio/imu/bmi323/bmi323_core.c
@@ -2199,12 +2199,12 @@ static int bmi323_core_runtime_suspend(struct device *dev)
 	}
 
 	for (unsigned int i = 0; i < ARRAY_SIZE(bmi323_ext_reg_savestate); i++) {
-		ret = bmi323_read_ext_reg(data, bmi323_reg_savestate[i],
-					  &savestate->reg_settings[i]);
+		ret = bmi323_read_ext_reg(data, bmi323_ext_reg_savestate[i],
+					  &savestate->ext_reg_settings[i]);
 		if (ret) {
 			dev_err(data->dev,
 				"Error reading bmi323 external reg 0x%x: %d\n",
-				bmi323_reg_savestate[i], ret);
+				bmi323_ext_reg_savestate[i], ret);
 			return ret;
 		}
 	}
@@ -2243,12 +2243,12 @@ static int bmi323_core_runtime_resume(struct device *dev)
 	}
 
 	for (unsigned int i = 0; i < ARRAY_SIZE(bmi323_ext_reg_savestate); i++) {
-		ret = bmi323_write_ext_reg(data, bmi323_reg_savestate[i],
-					   savestate->reg_settings[i]);
+		ret = bmi323_write_ext_reg(data, bmi323_ext_reg_savestate[i],
+					   savestate->ext_reg_settings[i]);
 		if (ret) {
 			dev_err(data->dev,
 				"Error writing bmi323 external reg 0x%x: %d\n",
-				bmi323_reg_savestate[i], ret);
+				bmi323_ext_reg_savestate[i], ret);
 			return ret;
 		}
 	}
-- 
2.45.2

[PATCH 2/2] iio: bmi323: fix reversed if statement in bmi323_core_runtime_resume()

[Dan Carpenter]

This reversed if statement means that the function just returns success
without writing to the registers.

Fixes: 16531118ba63 ("iio: bmi323: peripheral in lowest power state on suspend")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
 drivers/iio/imu/bmi323/bmi323_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iio/imu/bmi323/bmi323_core.c b/drivers/iio/imu/bmi323/bmi323_core.c
index d415b6542089..a56259c6434e 100644
--- a/drivers/iio/imu/bmi323/bmi323_core.c
+++ b/drivers/iio/imu/bmi323/bmi323_core.c
@@ -2232,7 +2232,7 @@ static int bmi323_core_runtime_resume(struct device *dev)
 	 * after being reset in the lower power state by runtime-pm.
 	 */
 	ret = bmi323_init(data);
-	if (!ret)
+	if (ret)
 		return ret;
 
 	/* Register must be cleared before changing an active config */
-- 
2.45.2

Re: [PATCH 2/2] iio: bmi323: fix reversed if statement in bmi323_core_runtime_resume()

[Denis Benato]

On 11/09/24 09:54, Dan Carpenter wrote:
> This reversed if statement means that the function just returns success
> without writing to the registers.
> 
> Fixes: 16531118ba63 ("iio: bmi323: peripheral in lowest power state on suspend")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
>  drivers/iio/imu/bmi323/bmi323_core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/imu/bmi323/bmi323_core.c b/drivers/iio/imu/bmi323/bmi323_core.c
> index d415b6542089..a56259c6434e 100644
> --- a/drivers/iio/imu/bmi323/bmi323_core.c
> +++ b/drivers/iio/imu/bmi323/bmi323_core.c
> @@ -2232,7 +2232,7 @@ static int bmi323_core_runtime_resume(struct device *dev)
>  	 * after being reset in the lower power state by runtime-pm.
>  	 */
>  	ret = bmi323_init(data);
> -	if (!ret)
> +	if (ret)
>  		return ret;
>  
>  	/* Register must be cleared before changing an active config */
Hi,

Thanks for spotting this. May I ask to add an error message in that if case that will also print out the ret value?

Thank you very much!

Best regards,
Denis Benato

Re: [PATCH 0/2] iio: bmi323: Fix some bugs in suspend resume

[Jonathan Cameron]

On Wed, 11 Sep 2024 10:54:25 +0300
Dan Carpenter <dan.carpenter@linaro.org> wrote:

> These were a couple bugs I found using static analysis.  I have not tested
> this code.
> 
> Dan Carpenter (2):
>   iio: bmi323: fix copy and paste bugs in suspend resume
>   iio: bmi323: fix reversed if statement in bmi323_core_runtime_resume()
> 
>  drivers/iio/imu/bmi323/bmi323_core.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 

These look good to me, but because I'm not planning another pre merge window
pull these will need to wait for rc1 so I have the code in my fixes branch.

If I seem to have lost them, feel free to poke me around rc2 time.

Thanks,

Jonathan