commit 7c8100357f83e2f08b9e5d0169cdd8f9c8837e39
author qctecmdr <qctecmdr@localhost> Thu Jul 23 03:07:10 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jul 23 03:07:10 2020 -0700
tree e71dc9da858d9586cdf60d5a474e6bcef0c25da3
parent 0be807087cdad1eea151b9c924dd79d19774b29d
parent 90808e5f012e73a25f954f2b7b8fb9ee61673eaf

Merge "libavb : Add change to update recovery rollback value"

QcomModulePkg/Library/avb/libavb/avb_slot_verify.c

diff --git a/QcomModulePkg/Library/avb/libavb/avb_slot_verify.c b/QcomModulePkg/Library/avb/libavb/avb_slot_verify.c
index 180e2d4..1a7dbdb 100644
--- a/QcomModulePkg/Library/avb/libavb/avb_slot_verify.c
+++ b/QcomModulePkg/Library/avb/libavb/avb_slot_verify.c
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -691,7 +691,7 @@
   if (!allow_verification_error) {
     if (stored_rollback_index < vbmeta_header.rollback_index) {
       io_ret = ops->write_rollback_index (
-          ops, rollback_index_location, vbmeta_header.rollback_index);
+          ops, rollback_index_location_to_use, vbmeta_header.rollback_index);
       if (io_ret != AVB_IO_RESULT_OK) {
         avb_errorv (full_partition_name,
                    ": Error storing rollback index for location.\n",
@@ -936,14 +936,15 @@
     }
   }
 
-  if (rollback_index_location >= AVB_MAX_NUMBER_OF_ROLLBACK_INDEX_LOCATIONS) {
+  if (rollback_index_location_to_use >=
+          AVB_MAX_NUMBER_OF_ROLLBACK_INDEX_LOCATIONS) {
     avb_errorv(
         full_partition_name, ": Invalid rollback_index_location.\n", NULL);
     ret = AVB_SLOT_VERIFY_RESULT_ERROR_INVALID_METADATA;
     goto out;
   }
 
-  slot_data->rollback_indexes[rollback_index_location] =
+  slot_data->rollback_indexes[rollback_index_location_to_use] =
       vbmeta_header.rollback_index;
 
   if (out_algorithm_type != NULL) {