diff options
author | Timur Tabi <timur@freescale.com> | 2008-05-08 05:19:59 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-05-15 20:49:49 +1000 |
commit | 64e4566f6d590fbb284da061b9b664c2486dd2de (patch) | |
tree | f47b0659fa97f798fa05708e4ea9ecc3e6d136cc | |
parent | cec08e7a948326b01555be6311480aa08e637de2 (diff) | |
download | blackbird-op-linux-64e4566f6d590fbb284da061b9b664c2486dd2de.tar.gz blackbird-op-linux-64e4566f6d590fbb284da061b9b664c2486dd2de.zip |
[POWERPC] Add null pointer check to of_find_property
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>
-rw-r--r-- | drivers/of/base.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 9bd7c4a31253..23ffb7c0caf2 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -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) { |