From: Heikki Krogerus <heikki.kroge...@linux.intel.com>
This fixes NULL pointer dereference when the primary fwnode handle
does not exist, for example with PCI devices that do not have ACPI
companion.
Signed-off-by: Heikki Krogerus <heikki.kroge...@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com>
(cherry picked from commit 0fb5902f2f9ec7996a0846087f3e69165ea9ce1e)
Signed-off-by: Voon, Weifeng <weifeng.v...@intel.com>
---
drivers/base/property.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/base/property.c b/drivers/base/property.c
index b6eb99b..c478cf0 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -215,7 +215,7 @@ bool fwnode_property_present(struct fwnode_handle *fwnode,
const char *propname)
bool ret;
ret = __fwnode_property_present(fwnode, propname);
- if (ret == false && fwnode->secondary)
+ if (ret == false && fwnode && fwnode->secondary)
ret = __fwnode_property_present(fwnode->secondary, propname);
return ret;
}
@@ -420,7 +420,7 @@ EXPORT_SYMBOL_GPL(device_property_match_string);
int _ret_;
\
_ret_ = FWNODE_PROP_READ(_fwnode_, _propname_, _type_, _proptype_,
\
_val_, _nval_);
\
- if (_ret_ == -EINVAL && _fwnode_->secondary)
\
+ if (_ret_ == -EINVAL && _fwnode_ && _fwnode_->secondary)
\
_ret_ = FWNODE_PROP_READ(_fwnode_->secondary, _propname_,
_type_, \
_proptype_, _val_, _nval_);
\
_ret_;
\
@@ -590,7 +590,7 @@ int fwnode_property_read_string_array(struct fwnode_handle
*fwnode,
int ret;
ret = __fwnode_property_read_string_array(fwnode, propname, val, nval);
- if (ret == -EINVAL && fwnode->secondary)
+ if (ret == -EINVAL && fwnode && fwnode->secondary)
ret = __fwnode_property_read_string_array(fwnode->secondary,
propname, val, nval);
return ret;
@@ -618,7 +618,7 @@ int fwnode_property_read_string(struct fwnode_handle
*fwnode,
int ret;
ret = __fwnode_property_read_string(fwnode, propname, val);
- if (ret == -EINVAL && fwnode->secondary)
+ if (ret == -EINVAL && fwnode && fwnode->secondary)
ret = __fwnode_property_read_string(fwnode->secondary,
propname, val);
return ret;
--
1.9.1
--
_______________________________________________
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
