Skip to content

Commit

Permalink
of: handle NULL node in next_child iterators
Browse files Browse the repository at this point in the history
Add an early check for the node argument in __of_get_next_child and
of_get_next_available_child() to avoid dereferencing a NULL node pointer
a few lines after.

CC: Daniel Mack <zonque@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
  • Loading branch information
Florian Fainelli authored and Rob Herring committed Jun 4, 2014
1 parent 64c5c75 commit 43cb436
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/of/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,9 @@ static struct device_node *__of_get_next_child(const struct device_node *node,
{
struct device_node *next;

if (!node)
return NULL;

next = prev ? prev->sibling : node->child;
for (; next; next = next->sibling)
if (of_node_get(next))
Expand Down Expand Up @@ -746,6 +749,9 @@ struct device_node *of_get_next_available_child(const struct device_node *node,
struct device_node *next;
unsigned long flags;

if (!node)
return NULL;

raw_spin_lock_irqsave(&devtree_lock, flags);
next = prev ? prev->sibling : node->child;
for (; next; next = next->sibling) {
Expand Down

0 comments on commit 43cb436

Please sign in to comment.