| Message ID | 20201102060841.23633-1-priyanka.singh@nxp.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Priyanka Jain |
| Headers | show |
| Series | [1/1] layerscape: fdt.c: Check for NULL return value from fdt_getprop() | expand |
>-----Original Message----- >From: Priyanka Singh <priyanka.singh@nxp.com> >Sent: Monday, November 2, 2020 11:39 AM >To: u-boot@lists.denx.de >Cc: Priyanka Jain <priyanka.jain@nxp.com>; Priyanka Singh ><priyanka.singh@nxp.com> >Subject: [PATCH 1/1] layerscape: fdt.c: Check for NULL return value from >fdt_getprop() > >Check for NULL return value from fdt_getprop() in fdt_fixup_remove_jr() > >Signed-off-by: Priyanka Singh <priyanka.singh@nxp.com> >--- <snip> Applied to fsl-qoriq after fixing checkpatch errors/warnings. Please run checkpatch test and fix warnings/errors before submitting the patch next time. Awaiting upstream. Thanks Priyanka
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c index f5f75fa452..5fc17a7233 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c @@ -391,10 +391,13 @@ void fdt_fixup_remove_jr(void *blob) while (jr_node != -FDT_ERR_NOTFOUND) { reg = (fdt32_t *)fdt_getprop(blob, jr_node, "reg", &len); - jr_offset = fdt_read_number(reg, addr_cells); - if (jr_offset == used_jr) { - fdt_del_node(blob, jr_node); - break; + if(reg != NULL) + { + jr_offset = fdt_read_number(reg, addr_cells); + if (jr_offset == used_jr) { + fdt_del_node(blob, jr_node); + break; + } } jr_node = fdt_node_offset_by_compatible(blob, jr_node, "fsl,sec-v4.0-job-ring");
Check for NULL return value from fdt_getprop() in fdt_fixup_remove_jr() Signed-off-by: Priyanka Singh <priyanka.singh@nxp.com> --- arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)