Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7472fd36a87e84c2819066543224285a6ab79ffc
Commit:     7472fd36a87e84c2819066543224285a6ab79ffc
Parent:     d2ceb47a7cbcc50b45832c6b24c47515838d169a
Author:     Cyrill Gorcunov <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 2 13:30:06 2007 -0700
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Oct 3 12:02:44 2007 +1000

    [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 <[EMAIL PROTECTED]>
    Cc: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
    Cc: Kumar Gala <[EMAIL PROTECTED]>
    Cc: Brian Waite <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 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 b5c6f21..b16742c 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 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to