Commit 01766d27 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'devprop-4.21-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull device properties framework fixes from Rafael Wysocki:
 "Fix two potential NULL pointer dereferences found by Coverity in the
  software nodes code introduced recently (Colin Ian King)"

* tag 'devprop-4.21-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  drivers: base: swnode: check if swnode is NULL before dereferencing it
  drivers: base: swnode: check if pointer p is NULL before dereferencing it
parents 35ddb06a f4747b9c
...@@ -477,7 +477,8 @@ software_node_get_parent(const struct fwnode_handle *fwnode) ...@@ -477,7 +477,8 @@ software_node_get_parent(const struct fwnode_handle *fwnode)
{ {
struct software_node *swnode = to_software_node(fwnode); struct software_node *swnode = to_software_node(fwnode);
return swnode->parent ? &swnode->parent->fwnode : NULL; return swnode ? (swnode->parent ? &swnode->parent->fwnode : NULL) :
NULL;
} }
struct fwnode_handle * struct fwnode_handle *
...@@ -487,7 +488,7 @@ software_node_get_next_child(const struct fwnode_handle *fwnode, ...@@ -487,7 +488,7 @@ software_node_get_next_child(const struct fwnode_handle *fwnode,
struct software_node *p = to_software_node(fwnode); struct software_node *p = to_software_node(fwnode);
struct software_node *c = to_software_node(child); struct software_node *c = to_software_node(child);
if (list_empty(&p->children) || if (!p || list_empty(&p->children) ||
(c && list_is_last(&c->entry, &p->children))) (c && list_is_last(&c->entry, &p->children)))
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment