diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2007-10-02 13:30:06 -0700 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-03 12:02:44 +1000 |
| commit | 7472fd36a87e84c2819066543224285a6ab79ffc (patch) | |
| tree | c3dc2d5f7e00c65a50f47f7e971bf2dffa28557e /drivers/misc | |
| parent | d2ceb47a7cbcc50b45832c6b24c47515838d169a (diff) | |
| download | linux-stable-7472fd36a87e84c2819066543224285a6ab79ffc.tar.gz linux-stable-7472fd36a87e84c2819066543224285a6ab79ffc.tar.bz2 linux-stable-7472fd36a87e84c2819066543224285a6ab79ffc.zip | |
[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>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/hdpuftrs/hdpu_cpustate.c | 5 | ||||
| -rw-r--r-- | drivers/misc/hdpuftrs/hdpu_nexus.c | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/drivers/misc/hdpuftrs/hdpu_cpustate.c b/drivers/misc/hdpuftrs/hdpu_cpustate.c index b5c6f21dcb69..b16742c7c69d 100644 --- a/drivers/misc/hdpuftrs/hdpu_cpustate.c +++ b/drivers/misc/hdpuftrs/hdpu_cpustate.c @@ -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; diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c index fda9998f45ca..01bc9179603b 100644 --- a/drivers/misc/hdpuftrs/hdpu_nexus.c +++ b/drivers/misc/hdpuftrs/hdpu_nexus.c @@ -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); |