* [PATCH 3/4] Sky Cpu and Nexus: check for platform_get_resource ret code
@ 2007-07-05 16:55 Cyrill Gorcunov
0 siblings, 0 replies; only message in thread
From: Cyrill Gorcunov @ 2007-07-05 16:55 UTC (permalink / raw)
To: LKML; +Cc: Andrew Morton
This patch adds checking for platform_get_resource() return
code to prevent possible NULL pointer usage.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
drivers/misc/hdpuftrs/hdpu_cpustate.c | 5 +++++
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 fdd9e2e..51e4963 100644
--- a/drivers/misc/hdpuftrs/hdpu_cpustate.c
+++ b/drivers/misc/hdpuftrs/hdpu_cpustate.c
@@ -195,6 +195,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 fda9998..01bc917 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);
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2007-07-05 16:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-05 16:55 [PATCH 3/4] Sky Cpu and Nexus: check for platform_get_resource ret code Cyrill Gorcunov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.