[PATCH v1 1/1] i2c: smbus: Check for parent device before dereference

[PATCH v1 1/1] i2c: smbus: Check for parent device before dereference

[Andy Shevchenko]

An I²C adapter might be instantiated without parent. In such case
there is no property can be retrieved. Skip SMBus alert setup when
this happens.

Fixes: a263a84088f6 ("i2c: smbus: Use device_*() functions instead of of_*()")
Reported-by: syzbot+0591ccf54ee05344e4eb@syzkaller.appspotmail.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/i2c/i2c-core-smbus.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/i2c-core-smbus.c b/drivers/i2c/i2c-core-smbus.c
index 304c2c8fee68..029f1b7c83bc 100644
--- a/drivers/i2c/i2c-core-smbus.c
+++ b/drivers/i2c/i2c-core-smbus.c
@@ -705,10 +705,14 @@ EXPORT_SYMBOL_GPL(i2c_new_smbus_alert_device);
 #if IS_ENABLED(CONFIG_I2C_SMBUS)
 int i2c_setup_smbus_alert(struct i2c_adapter *adapter)
 {
+	struct device *parent = adapter->dev.parent;
 	int irq;
 
-	irq = device_property_match_string(adapter->dev.parent, "interrupt-names",
-					   "smbus_alert");
+	/* Adapter instantiated without parent, skip the SMBus alert setup */
+	if (!parent)
+		return 0;
+
+	irq = device_property_match_string(parent, "interrupt-names", "smbus_alert");
 	if (irq == -EINVAL || irq == -ENODATA)
 		return 0;
 	else if (irq < 0)
-- 
2.34.1

Re: [PATCH v1 1/1] i2c: smbus: Check for parent device before dereference

[Andy Shevchenko]

On Fri, Feb 04, 2022 at 05:59:20PM +0200, Andy Shevchenko wrote:
> An I²C adapter might be instantiated without parent. In such case
> there is no property can be retrieved. Skip SMBus alert setup when
> this happens.

As of today the problem is still in v5.17-rcX.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v1 1/1] i2c: smbus: Check for parent device before dereference

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

On Fri, Feb 04, 2022 at 05:59:20PM +0200, Andy Shevchenko wrote:
> An I²C adapter might be instantiated without parent. In such case
> there is no property can be retrieved. Skip SMBus alert setup when
> this happens.
> 
> Fixes: a263a84088f6 ("i2c: smbus: Use device_*() functions instead of of_*()")
> Reported-by: syzbot+0591ccf54ee05344e4eb@syzkaller.appspotmail.com
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Applied to for-next, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]