]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
powerpc: Protect against NULL pointer deref in phyp-dump code
authorTony Breeds <tony@bakeyournoodle.com>
Mon, 15 Dec 2008 18:17:48 +0000 (18:17 +0000)
committerPaul Mackerras <paulus@samba.org>
Sun, 21 Dec 2008 03:21:14 +0000 (14:21 +1100)
print_dump_header() will be called at least once with a NULL pointer in
a normal boot sequence.  If DEBUG is defined then we will dereference
the pointer and crash.  Add a quick fix to exit early in the NULL pointer
case.

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Acked-by: Manish Ahuja <mahujam@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/platforms/pseries/phyp_dump.c

index edbc012c2ebca1cff90c13d713d2e442e3ac52a1..16e659a714401bd4f284d1d2cac7ffc5ec28a121 100644 (file)
@@ -130,6 +130,9 @@ static unsigned long init_dump_header(struct phyp_dump_header *ph)
 static void print_dump_header(const struct phyp_dump_header *ph)
 {
 #ifdef DEBUG
+       if (ph == NULL)
+               return;
+
        printk(KERN_INFO "dump header:\n");
        /* setup some ph->sections required */
        printk(KERN_INFO "version = %d\n", ph->version);