commit 122957c1a833df0869bd18c1e09ea52d66a9827b
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 27 17:08:32 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 27 17:08:33 2017 +0000
tree 2c62ea60f3ce00865fc1b5b480337afc8ad5f3ca
parent 66708b995192c483d5022f53ef7ed6003d2ecc16
parent 9204eccd1b993415b1fb1d2f61f2f7b702336fe0

Merge "fs_mgr_avb: fix return value check of fs_mgr_get_boot_config()"

fs_mgr/fs_mgr_avb.cpp

diff --git a/fs_mgr/fs_mgr_avb.cpp b/fs_mgr/fs_mgr_avb.cpp
index 35577e3..a762038 100644
--- a/fs_mgr/fs_mgr_avb.cpp
+++ b/fs_mgr/fs_mgr_avb.cpp
@@ -454,12 +454,12 @@
     // be returned when there is an error.
 
     std::string hash_alg;
-    if (fs_mgr_get_boot_config("vbmeta.hash_alg", &hash_alg) == 0) {
-        if (hash_alg == "sha256" || hash_alg == "sha512") {
-            return true;
-        }
+    if (!fs_mgr_get_boot_config("vbmeta.hash_alg", &hash_alg)) {
+        return false;
     }
-
+    if (hash_alg == "sha256" || hash_alg == "sha512") {
+        return true;
+    }
     return false;
 }