Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7472fd36 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Paul Mackerras
Browse files

[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: default avatarCyrill 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent d2ceb47a

drivers/misc/hdpuftrs/hdpu_cpustate.c

+5 −0
Original line number Diff line number Diff line
@@ -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;

drivers/misc/hdpuftrs/hdpu_nexus.c

+6 −1
Original line number Diff line number Diff line
@@ -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);