diff options
| author | Suraj Jitindar Singh | 2016-04-28 07:53:45 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2016-05-11 13:54:03 +0200 |
| commit | b2ed059642875a699a195cb136b2e57e7e07cedf (patch) | |
| tree | ad8207f829dd1c14f473f78fdf67518271b303c6 | |
| parent | powerpc/powernv/pci: Fix cfg_dbg() & replace with pr_devel() (diff) | |
| download | kernel-qcow2-linux-b2ed059642875a699a195cb136b2e57e7e07cedf.tar.gz kernel-qcow2-linux-b2ed059642875a699a195cb136b2e57e7e07cedf.tar.xz kernel-qcow2-linux-b2ed059642875a699a195cb136b2e57e7e07cedf.zip | |
powerpc/pseries: Add null property check to pseries_discover_pic()
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.
Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
Reviewed-by: Chris Smart <chris@distroguy.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
| -rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 6e944fc6e5f9..fa734943bcbc 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; |