Skip to contentSkip to conversation

iio: imu: st_lsm6dsx: check st_lsm6dsx_shub_read_output return

PATCH In review [email protected] 3 participants 3 messages Aug 9, 2020 – Sep 19, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: imu: st_lsm6dsx: check st_lsm6dsx_shub_read_output return

From: Tom Rix <[email protected]>

clang static analysis reports this represenative problem

st_lsm6dsx_shub.c:540:8: warning: Assigned value is garbage or undefined

        *val = (s16)le16_to_cpu(*((__le16 *)data));
             ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

data is set with

	err = st_lsm6dsx_shub_read(sensor, ch->address, data, len);
	if (err < 0)
		return err;

The problem with st_lsm6dsx_shub_read() is this statement

	err = st_lsm6dsx_shub_read_output(hw, data,
					  len & ST_LS6DSX_READ_OP_MASK);

The err value is never checked.
So check err.

Fixes c91c1c844ebd ("iio: imu: st_lsm6dsx: add i2c embedded controller support")
---
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c +2 -0
index ed83471dc7dd..8c8d8870ca07 100644
@@ -313,6 +313,8 @@ st_lsm6dsx_shub_read(struct st_lsm6dsx_sensor *sensor, u8 addr,
 
 	err = st_lsm6dsx_shub_read_output(hw, data,
 					  len & ST_LS6DSX_READ_OP_MASK);
+	if (err < 0)
+		return err;
 
 	st_lsm6dsx_shub_master_enable(sensor, false);
 
Signature · 1 line
2.18.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 20 lines · On Sun, Aug 9, 2020 at 8:56 PM <[email protected]> wrote:

From: Tom Rix <[email protected]>

clang static analysis reports this represenative problem

st_lsm6dsx_shub.c:540:8: warning: Assigned value is garbage or undefined

        *val = (s16)le16_to_cpu(*((__le16 *)data));
             ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

data is set with

        err = st_lsm6dsx_shub_read(sensor, ch->address, data, len);
        if (err < 0)
                return err;

The problem with st_lsm6dsx_shub_read() is this statement

err = st_lsm6dsx_shub_read_output(hw, data,
len & ST_LS6DSX_READ_OP_MASK);

Quoted 8 lines

The err value is never checked.
So check err.

Fixes c91c1c844ebd ("iio: imu: st_lsm6dsx: add i2c embedded controller support")

You see, the commit message can be divided to three sections

1. Title / very short description
2. Detailed description
3. Tag block

Each of them has some specific rules:
1. One quite short line prefixed by subsystem / driver in the specified format (usually gathered by reading git log against the module in question)
2. Should explain why this change is done
3. Should be one tag -- one line, no blank lines in between.

Hope, you will use this in the future.

After addressing that (perhaps Jonathan will do it for you)

Quoted 20 lines
---
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c +2 -1
index ed83471dc7dd..8c8d8870ca07 100644
@@ -313,6 +313,8 @@ st_lsm6dsx_shub_read(struct st_lsm6dsx_sensor *sensor, u8 addr,
 
        err = st_lsm6dsx_shub_read_output(hw, data,
                                          len & ST_LS6DSX_READ_OP_MASK);
+       if (err < 0)
+               return err;
 
        st_lsm6dsx_shub_master_enable(sensor, false);
 
--

2.18.1

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#2 lore raw
Quoted 43 lines · On Mon, 10 Aug 2020 11:08:39 +0300 Andy Shevchenko <[email protected]>…
Quoted 20 lines · On Sun, Aug 9, 2020 at 8:56 PM <[email protected]> wrote:

From: Tom Rix <[email protected]>

clang static analysis reports this represenative problem

st_lsm6dsx_shub.c:540:8: warning: Assigned value is garbage or undefined

        *val = (s16)le16_to_cpu(*((__le16 *)data));
             ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

data is set with

        err = st_lsm6dsx_shub_read(sensor, ch->address, data, len);
        if (err < 0)
                return err;

The problem with st_lsm6dsx_shub_read() is this statement

err = st_lsm6dsx_shub_read_output(hw, data,
len & ST_LS6DSX_READ_OP_MASK);

Quoted 8 lines

The err value is never checked.
So check err.

Fixes c91c1c844ebd ("iio: imu: st_lsm6dsx: add i2c embedded controller support")

You see, the commit message can be divided to three sections

1. Title / very short description
2. Detailed description
3. Tag block

Each of them has some specific rules:
1. One quite short line prefixed by subsystem / driver in the specified format (usually gathered by reading git log against the module in question)
2. Should explain why this change is done
3. Should be one tag -- one line, no blank lines in between.

Quoted 4 lines

Hope, you will use this in the future.

After addressing that (perhaps Jonathan will do it for you)

Description adjusted and patch applied. Given timing in cycle I've queued this for the next merge window rather than trying to get it in during this cycle.

Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to see if we missed anything.

thanks,

Jonathan

Quoted 23 lines
Quoted 21 lines
---
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c +2 -1
index ed83471dc7dd..8c8d8870ca07 100644
@@ -313,6 +313,8 @@ st_lsm6dsx_shub_read(struct st_lsm6dsx_sensor *sensor, u8 addr,
 
        err = st_lsm6dsx_shub_read_output(hw, data,
                                          len & ST_LS6DSX_READ_OP_MASK);
+       if (err < 0)
+               return err;
 
        st_lsm6dsx_shub_master_enable(sensor, false);
 
--

2.18.1