Skip to content

Commit

Permalink
[POWERPC] Sky Cpu and Nexus: check for platform_get_resource retcode
Browse files Browse the repository at this point in the history
Add adds checking for platform_get_resource() return code to prevent
possible NULL pointer usage.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Kumar Gala <galak@gate.crashing.org>
Cc: Brian Waite <waite@skycomputers.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Cyrill Gorcunov authored and Paul Mackerras committed Oct 3, 2007
1 parent d2ceb47 commit 7472fd3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
5 changes: 5 additions & 0 deletions drivers/misc/hdpuftrs/hdpu_cpustate.c
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@ static int hdpu_cpustate_probe(struct platform_device *pdev)
int ret;

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
printk(KERN_ERR "sky_cpustate: "
"Invalid memory resource.\n");
return -EINVAL;
}
cpustate.set_addr = (unsigned long *)res->start;
cpustate.clr_addr = (unsigned long *)res->end - 1;

Expand Down
7 changes: 6 additions & 1 deletion drivers/misc/hdpuftrs/hdpu_nexus.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,19 @@ static int hdpu_nexus_probe(struct platform_device *pdev)
int *nexus_id_addr;

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
printk(KERN_ERR "sky_nexus: "
"Invalid memory resource.\n");
return -EINVAL;
}
nexus_id_addr = ioremap(res->start,
(unsigned long)(res->end - res->start));
if (nexus_id_addr) {
slot_id = (*nexus_id_addr >> 8) & 0x1f;
chassis_id = *nexus_id_addr & 0xff;
iounmap(nexus_id_addr);
} else {
printk(KERN_ERR "Could not map slot id\n");
printk(KERN_ERR "sky_nexus: Could not map slot id\n");
}

hdpu_slot_id = create_proc_entry("sky_slot_id", 0666, &proc_root);
Expand Down

0 comments on commit 7472fd3

Please sign in to comment.