]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[POWERPC] Add null pointer check to of_find_property
authorTimur Tabi <timur@freescale.com>
Wed, 7 May 2008 19:19:59 +0000 (05:19 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 15 May 2008 10:49:49 +0000 (20:49 +1000)
Update function of_find_property() to return NULL if the device_node
passed to it is also NULL.  Otherwise, passing NULL will cause a null
pointer dereference.

Without this, the legacy_serial driver will crash if there's no
'chosen' node in the device tree.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
drivers/of/base.c

index 9bd7c4a31253a5d7349d5b2fd3cb383e826d9680..23ffb7c0caf24148277ddd19c7430b5c90fb6fcb 100644 (file)
@@ -65,6 +65,9 @@ struct property *of_find_property(const struct device_node *np,
 {
        struct property *pp;
 
+       if (!np)
+               return NULL;
+
        read_lock(&devtree_lock);
        for (pp = np->properties; pp != 0; pp = pp->next) {
                if (of_prop_cmp(pp->name, name) == 0) {