Procházet zdrojové kódy

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>
Chen Guanqiao před 2 roky
rodič
revize
1b098b3e65
1 změnil soubory, kde provedl 3 přidání a 3 odebrání
  1. 3 3
      drivers/core/ofnode.c

+ 3 - 3
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)