Messages in this thread | | | From | Grant Likely <> | Subject | Re: [PATCH] of: handle NULL node in of_get_next_available_child | Date | Tue, 27 May 2014 12:19:30 +0100 |
| |
On Fri, 23 May 2014 12:43:11 -0700, Florian Fainelli <f.fainelli@gmail.com> wrote: > Add an early check for the node argument in > 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>
Is there a bug that exposed this path? I'd like some more justification before merging this patch, particularly considering of_get_next_child() doesn't check for it either, but you're not modifying that function.
g.
> --- > drivers/of/base.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/of/base.c b/drivers/of/base.c > index e67b308819c9..9a71bfac78ae 100644 > --- a/drivers/of/base.c > +++ b/drivers/of/base.c > @@ -746,6 +746,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) { > -- > 1.9.1 >
| |