i3c: fix uninitialized variable use in i2c setup

Commit 31b9887c7258 ("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: 31b9887c7258 ("i3c: remove i2c board info from i2c_dev_desc")
Reported-by: kernel test robot <lkp@intel.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Jamie Iles <quic_jiles@quicinc.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20220308134226.1042367-1-quic_jiles@quicinc.com

diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index 6cacbca..7850287 100644 (file)
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -2307,8 +2307,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;
 }