The patch titled
Sky Cpu and Nexus: check for platform_get_resource ret code
has been removed from the -mm tree. Its filename was
sky-cpu-and-nexus-check-for-platform_get_resource-ret.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Sky Cpu and Nexus: check for platform_get_resource ret code
From: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
tAdd adds checking for platform_get_resource() return code to prevent possible
NULL pointer usage.
Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Kumar Gala <galak@xxxxxxxxxxxxxxxxx>
Cc: Brian Waite <waite@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/misc/hdpuftrs/hdpu_cpustate.c | 5 +++++
drivers/misc/hdpuftrs/hdpu_nexus.c | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff -puN drivers/misc/hdpuftrs/hdpu_cpustate.c~sky-cpu-and-nexus-check-for-platform_get_resource-ret drivers/misc/hdpuftrs/hdpu_cpustate.c
--- a/drivers/misc/hdpuftrs/hdpu_cpustate.c~sky-cpu-and-nexus-check-for-platform_get_resource-ret
+++ a/drivers/misc/hdpuftrs/hdpu_cpustate.c
@@ -194,6 +194,11 @@ static int hdpu_cpustate_probe(struct pl
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 -puN drivers/misc/hdpuftrs/hdpu_nexus.c~sky-cpu-and-nexus-check-for-platform_get_resource-ret drivers/misc/hdpuftrs/hdpu_nexus.c
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c~sky-cpu-and-nexus-check-for-platform_get_resource-ret
+++ a/drivers/misc/hdpuftrs/hdpu_nexus.c
@@ -62,6 +62,11 @@ static int hdpu_nexus_probe(struct platf
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 platf
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);
_
Patches currently in -mm which might be from gorcunov@xxxxxxxxx are
git-cifs.patch
git-powerpc.patch
udf-code-style-fixup-v3.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
