From: Timur Tabi <timur@freescale.com>
Date: Wed, 7 May 2008 19:19:59 +0000 (+1000)
Subject: [POWERPC] Add null pointer check to of_find_property
X-Git-Tag: v2.6.26-rc3~24^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=64e4566f6d590fbb284da061b9b664c2486dd2de;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 9bd7c4a3125..23ffb7c0caf 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) {