mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-15 05:11:32 +00:00
[POWERPC] Sky Cpu and Nexus: check for platform_get_resource retcode
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>
This commit is contained in:
parent
d2ceb47a7c
commit
7472fd36a8
@ -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;
|
||||
|
||||
|
@ -62,6 +62,11 @@ 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) {
|
||||
@ -69,7 +74,7 @@ static int hdpu_nexus_probe(struct platform_device *pdev)
|
||||
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);
|
||||
|
Loading…
Reference in New Issue
Block a user