[PATCH] i3c: fix uninitialized variable use in i2c setup
Jamie Iles
quic_jiles at quicinc.com
Tue Mar 8 05:42:26 PST 2022
97a82882d852 ("i3c: remove i2c board info from i2c_dev_desc") removed
the boardinfo from i2c_dev_desc to decouple device enumeration from
setup but did not correctly lookup the i2c_dev_desc to store the new
device, instead dereferencing an uninitialized variable.
Lookup the device that has already been registered by address to store
the i2c client device.
Fixes: 97a82882d852 ("i3c: remove i2c board info from i2c_dev_desc")
Reported-by: kernel test robot <lkp at intel.com>
Cc: Alexandre Belloni <alexandre.belloni at bootlin.com>
Signed-off-by: Jamie Iles <quic_jiles at quicinc.com>
---
drivers/i3c/master.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index db0fa6887eef..f0bdecd7940f 100644
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -2318,8 +2318,13 @@ static int i3c_master_i2c_adapter_init(struct i3c_master_controller *master)
* We silently ignore failures here. The bus should keep working
* correctly even if one or more i2c devices are not registered.
*/
- list_for_each_entry(i2cboardinfo, &master->boardinfo.i2c, node)
+ list_for_each_entry(i2cboardinfo, &master->boardinfo.i2c, node) {
+ i2cdev = i3c_master_find_i2c_dev_by_addr(master,
+ i2cboardinfo->base.addr);
+ if (WARN_ON(!i2cdev))
+ continue;
i2cdev->dev = i2c_new_client_device(adap, &i2cboardinfo->base);
+ }
return 0;
}
--
2.32.0
More information about the linux-i3c
mailing list