diff mbox

[U-Boot] armv8/fsl-lsch3: fdt: Check the pointer returned from call to a function may be NULL

Message ID 1441075647-11274-1-git-send-email-b18965@freescale.com
State Accepted
Delegated to: York Sun
Headers show

Commit Message

Alison Wang Sept. 1, 2015, 2:47 a.m. UTC 
Pointer 'reg' returned from call to function 'fdt_getprop' may be
NULL, will be passed to function and may be dereferenced there by
passing argument 1 to function 'of_read_number'. So check pointer
'reg' first.

Signed-off-by: Alison Wang <alison.wang@freescale.com>
---
 arch/arm/cpu/armv8/fsl-lsch3/fdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

York Sun Oct. 30, 2015, 4:12 p.m. UTC | #1 
On 08/31/2015 07:47 PM, Alison Wang wrote:
> Pointer 'reg' returned from call to function 'fdt_getprop' may be
> NULL, will be passed to function and may be dereferenced there by
> passing argument 1 to function 'of_read_number'. So check pointer
> 'reg' first.
> 
> Signed-off-by: Alison Wang <alison.wang@freescale.com>
> ---


Applied to u-boot-fsl-qoriq. Awaiting upstream. Thanks.

York
diff mbox

Patch

diff --git a/arch/arm/cpu/armv8/fsl-lsch3/fdt.c b/arch/arm/cpu/armv8/fsl-lsch3/fdt.c
index 567c419..922e8a0 100644
--- a/arch/arm/cpu/armv8/fsl-lsch3/fdt.c
+++ b/arch/arm/cpu/armv8/fsl-lsch3/fdt.c
@@ -33,8 +33,8 @@  void ft_fixup_cpu(void *blob)
 	off = fdt_node_offset_by_prop_value(blob, -1, "device_type", "cpu", 4);
 	while (off != -FDT_ERR_NOTFOUND) {
 		reg = (fdt32_t *)fdt_getprop(blob, off, "reg", 0);
-		core_id = of_read_number(reg, addr_cells);
 		if (reg) {
+			core_id = of_read_number(reg, addr_cells);
 			if (core_id  == 0 || (is_core_online(core_id))) {
 				val = spin_tbl_addr;
 				val += id_to_core(core_id) *