[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220204155920.13364-1-andriy.shevchenko@linux.intel.com>
Date: Fri, 4 Feb 2022 17:59:20 +0200
From: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To: linux-i2c@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: Wolfram Sang <wsa@...nel.org>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
syzbot+0591ccf54ee05344e4eb@...kaller.appspotmail.com
Subject: [PATCH v1 1/1] i2c: smbus: Check for parent device before dereference
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@...kaller.appspotmail.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.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
Powered by blists - more mailing lists