Commit 8804827b authored by Grant Likely's avatar Grant Likely
Browse files

of: Fix dereferencing node name in debug output to be safe 



Several locations in the of_address and of_irq code dereference the
full_name parameter from a device_node pointer without checking if the
pointer is valid.  This patch switches to use of_node_full_name() which
always checks the pointer.

Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
parent f3cea45a

drivers/of/address.c

+3 −3
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static u64 __of_translate_address(struct device_node *dev, 
	int na, ns, pna, pns;

	u64 result = OF_BAD_ADDR;



	pr_debug("OF: ** translation for device %s **\n", dev->full_name);

	pr_debug("OF: ** translation for device %s **\n", of_node_full_name(dev));



	/* Increase refcount at current level */

	of_node_get(dev);
@@ -504,13 +504,13 @@ static u64 __of_translate_address(struct device_node *dev, 
	bus->count_cells(dev, &na, &ns);

	if (!OF_CHECK_COUNTS(na, ns)) {

		printk(KERN_ERR "prom_parse: Bad cell count for %s\n",

		       dev->full_name);

		       of_node_full_name(dev));

		goto bail;

	}

	memcpy(addr, in_addr, na * 4);



	pr_debug("OF: bus is %s (na=%d, ns=%d) on %s\n",

	    bus->name, na, ns, parent->full_name);

	    bus->name, na, ns, of_node_full_name(parent));

	of_dump_addr("OF: translating address:", addr, na);



	/* Translate */

drivers/of/irq.c

+4 −4
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ int of_irq_map_raw(struct device_node *parent, const __be32 *intspec, 
	int imaplen, match, i;



	pr_debug("of_irq_map_raw: par=%s,intspec=[0x%08x 0x%08x...],ointsize=%d\n",

		 parent->full_name, be32_to_cpup(intspec),

		 of_node_full_name(parent), be32_to_cpup(intspec),

		 be32_to_cpup(intspec + 1), ointsize);



	ipar = of_node_get(parent);
@@ -126,7 +126,7 @@ int of_irq_map_raw(struct device_node *parent, const __be32 *intspec, 
		goto fail;

	}



	pr_debug("of_irq_map_raw: ipar=%s, size=%d\n", ipar->full_name, intsize);

	pr_debug("of_irq_map_raw: ipar=%s, size=%d\n", of_node_full_name(ipar), intsize);



	if (ointsize != intsize)

		return -EINVAL;
@@ -287,7 +287,7 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq 
	u32 intsize, intlen;

	int res = -EINVAL;



	pr_debug("of_irq_map_one: dev=%s, index=%d\n", device->full_name, index);

	pr_debug("of_irq_map_one: dev=%s, index=%d\n", of_node_full_name(device), index);



	/* OldWorld mac stuff is "special", handle out of line */

	if (of_irq_workarounds & OF_IMAP_OLDWORLD_MAC)
@@ -355,7 +355,7 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r) 


		r->start = r->end = irq;

		r->flags = IORESOURCE_IRQ;

		r->name = name ? name : dev->full_name;

		r->name = name ? name : of_node_full_name(dev);

	}



	return irq;

CRA Git | Maintained and supported by SUSTech CRA and CCSE