fix coverity issue for Boot in kernelflinger - 2

Test Done: boot/reboot several times work normally Tracked-On: OAM-126533 Signed-off-by: Zhao, Shirley <[email protected]>
projectceladon · Oct 21, 2024 · 15a24d3 · 15a24d3
1 parent 953f01f
commit 15a24d3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/libadb/reader.c b/libadb/reader.c
@@ -523,7 +523,6 @@ static EFI_STATUS vmcore_build_header(reader_ctx_t *ctx, void *priv_p)
 
 		if (priv->m.end && end > priv->m.end) {
 			length -= end - priv->m.end;
-			end = priv->m.end;
 		}
 
 		priv->hdr.phnum++;
@@ -581,7 +580,7 @@ static EFI_STATUS vmcore_read(reader_ctx_t *ctx, unsigned char **buf, UINT64 *le
 
 	/* Start new memory region */
 	if (priv->m.cur == priv->m.cur_end) {
-		if (priv->cur_phdr == priv->hdr.phnum - 1) {
+		if (priv->cur_phdr >= priv->hdr.phnum - 1) {
 			error(L"Invalid parameter in %a", __func__);
 			return EFI_INVALID_PARAMETER;
 		}

diff --git a/libfastboot/flash.c b/libfastboot/flash.c
@@ -659,10 +659,12 @@ EFI_STATUS erase_by_label(CHAR16 *label)
 	if (!CompareGuid(&p_gparti->part.type, &EfiPartTypeSystemPartitionGuid))
 		return gpt_refresh();
 
+#ifdef USER
 	if (is_data)
 		userdata_erased = TRUE;
 	if (is_share_data)
 		share_data_erased = TRUE;
+#endif
 
 	return EFI_SUCCESS;
 }

diff --git a/libkernelflinger/fatfs/source/ff.c b/libkernelflinger/fatfs/source/ff.c
@@ -5171,7 +5171,7 @@ FRESULT f_mkdir (
 					res = sync_fs(fs);
 				}
 			} else {
-				remove_chain(&sobj, dcl, 0);		/* Could not register, remove the allocated cluster */
+				res = remove_chain(&sobj, dcl, 0);		/* Could not register, remove the allocated cluster */
 			}
 		}
 		FREE_NAMBUF();