Skip to content

Commit

Permalink
microblaze: Sane handling of missing timer/intc in device tree
Browse files Browse the repository at this point in the history
This code path doesn't test any returned pointers for NULL, leading to a bad
kernel page fault if there's no timer/intc found.

Slightly better is to BUG(), but even better still would be a printk beforehand.

Signed-off-by: John Williams <john.williams@petalogix.com>
Signed-off-by: Michal Simek <monstr@monstr.eu>
  • Loading branch information
John Williams authored and Michal Simek committed Aug 18, 2009
1 parent 6b99ece commit 892ee92
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/microblaze/kernel/intc.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <linux/irq.h>
#include <asm/page.h>
#include <linux/io.h>
#include <linux/bug.h>

#include <asm/prom.h>
#include <asm/irq.h>
Expand Down Expand Up @@ -130,6 +131,7 @@ void __init init_IRQ(void)
if (intc)
break;
}
BUG_ON(!intc);

intc_baseaddr = *(int *) of_get_property(intc, "reg", NULL);
intc_baseaddr = (unsigned long) ioremap(intc_baseaddr, PAGE_SIZE);
Expand Down
2 changes: 2 additions & 0 deletions arch/microblaze/kernel/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <linux/clocksource.h>
#include <linux/clockchips.h>
#include <linux/io.h>
#include <linux/bug.h>
#include <asm/cpuinfo.h>
#include <asm/setup.h>
#include <asm/prom.h>
Expand Down Expand Up @@ -234,6 +235,7 @@ void __init time_init(void)
if (timer)
break;
}
BUG_ON(!timer);

timer_baseaddr = *(int *) of_get_property(timer, "reg", NULL);
timer_baseaddr = (unsigned long) ioremap(timer_baseaddr, PAGE_SIZE);
Expand Down

0 comments on commit 892ee92

Please sign in to comment.