summaryrefslogtreecommitdiff
path: root/drivers/core
diff options
context:
space:
mode:
authorChen Guanqiao <chenguanqiao@kuaishou.com>2021-07-12 10:40:20 +0300
committerSimon Glass <sjg@chromium.org>2021-07-21 19:27:35 +0300
commit1b098b3e655451572054ce933a87231ee16f7133 (patch)
treec82af4506ebb2e5144438b0d5ef10411257caece /drivers/core
parentfd25ca3275946476d5c3fa32e3e7e3087fa5c572 (diff)
downloadu-boot-1b098b3e655451572054ce933a87231ee16f7133.tar.xz
dm: core: fix no null pointer detection in ofnode_get_addr_size_index()
Fixed a defect of a null pointer being discovered by Coverity Scan: CID 331544: Null pointer dereferences (REVERSE_INULL) Null-checking "size" suggests that it may be null, but it has already been dereferenced on all paths leading to the check. Signed-off-by: Chen Guanqiao <chenguanqiao@kuaishou.com>
Diffstat (limited to 'drivers/core')
-rw-r--r--drivers/core/ofnode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index eeeccfb446..dda6c76e83 100644
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -329,7 +329,8 @@ static fdt_addr_t __ofnode_get_addr_size_index(ofnode node, int index,
{
int na, ns;
- *size = FDT_SIZE_T_NONE;
+ if (size)
+ *size = FDT_SIZE_T_NONE;
if (ofnode_is_np(node)) {
const __be32 *prop_val;
@@ -340,6 +341,7 @@ static fdt_addr_t __ofnode_get_addr_size_index(ofnode node, int index,
&flags);
if (!prop_val)
return FDT_ADDR_T_NONE;
+
if (size)
*size = size64;
@@ -359,8 +361,6 @@ static fdt_addr_t __ofnode_get_addr_size_index(ofnode node, int index,
index, na, ns, size,
translate);
}
-
- return FDT_ADDR_T_NONE;
}
fdt_addr_t ofnode_get_addr_size_index(ofnode node, int index, fdt_size_t *size)