platform: msm_shared: Validate boot image for VB2 verification
Remove condition to skip boot image validation.
As LK is incrementing num_loaded_images while
loading images, hence we are falling into the
condition which only need to be skipped in case
of fastboot boot.
Change-Id: Ie91dcab78f22fbdf2dad4a76862e173c6d5189a6
diff --git a/platform/msm_shared/avb/VerifiedBoot.c b/platform/msm_shared/avb/VerifiedBoot.c
index d76b209..0787726 100644
--- a/platform/msm_shared/avb/VerifiedBoot.c
+++ b/platform/msm_shared/avb/VerifiedBoot.c
@@ -435,11 +435,6 @@
}
RequestedPartition = (const CHAR8 **)RequestedPartitionAll;
- if (Info->num_loaded_images) {
- /* fastboot boot option, skip Index 0, boot image already loaded */
- RequestedPartition = (const CHAR8 **)&RequestedPartitionAll[1];
- NumRequestedPartition--;
- }
VerityFlags = VerityEnforcing ?
AVB_HASHTREE_ERROR_MODE_RESTART :
diff --git a/platform/msm_shared/avb/libavb/avb_slot_verify.c b/platform/msm_shared/avb/libavb/avb_slot_verify.c
index 40bfbe5..60d4a5f 100644
--- a/platform/msm_shared/avb/libavb/avb_slot_verify.c
+++ b/platform/msm_shared/avb/libavb/avb_slot_verify.c
@@ -232,6 +232,8 @@
NULL);
ret = AVB_SLOT_VERIFY_RESULT_ERROR_VERIFICATION;
goto out;
+ } else {
+ avb_debugv(part_name, ": success: Image verification completed.\n", NULL);
}
ret = AVB_SLOT_VERIFY_RESULT_OK;
diff --git a/platform/msm_shared/avb/libavb/avb_util.h b/platform/msm_shared/avb/libavb/avb_util.h
index 07c3258..93046c8 100644
--- a/platform/msm_shared/avb/libavb/avb_util.h
+++ b/platform/msm_shared/avb/libavb/avb_util.h
@@ -37,6 +37,7 @@
#define AVB_STRINGIFY(x) #x
#define AVB_TO_STRING(x) AVB_STRINGIFY(x)
+#define AVB_ENABLE_DEBUG 1
#ifdef AVB_ENABLE_DEBUG
/* Aborts the program if |expr| is false.