[PATCH] powerpc/pseries: Add null property check to pseries_discover_pic()

Chris Smart chris at distroguy.com
Mon May 2 12:30:01 AEST 2016

On Thu, Apr 28, 2016 at 03:53:45PM +1000, Suraj Jitindar Singh wrote:
>The return value of of_get_property() isn't checked before it is passed
>to the strstr() function, if it happens that the return value is null
>then this will result in a null pointer being dereferenced.
>Add a check to see if the return value of of_get_property() is null and
>if it is continue straight on to the next node.

Hi Suraj,

Presumably machines have been shipping with a device tree that contains
"compatible" in the interrupt controller section and so we just happen
to have never hit this. Good thing to check.

Confirming that strstr calls strlen on the first argument, which would
dereference a null pointer.

Reviewed-by: Chris Smart <chris at distroguy.com>

>Signed-off-by: Suraj Jitindar Singh <sjitindarsingh at gmail.com>
> arch/powerpc/platforms/pseries/setup.c | 2 ++
> 1 file changed, 2 insertions(+)
>diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
>index 6e944fc..fa73494 100644
>--- a/arch/powerpc/platforms/pseries/setup.c
>+++ b/arch/powerpc/platforms/pseries/setup.c
>@@ -235,6 +235,8 @@ static void __init pseries_discover_pic(void)
> 	for_each_node_by_name(np, "interrupt-controller") {
> 		typep = of_get_property(np, "compatible", NULL);
>+		if (!typep)
>+			continue;
> 		if (strstr(typep, "open-pic")) {
> 			pSeries_mpic_node = of_node_get(np);
> 			ppc_md.init_IRQ       = pseries_mpic_init_IRQ;
>Linuxppc-dev mailing list
>Linuxppc-dev at lists.ozlabs.org

More information about the Linuxppc-dev mailing list