commit 3e5319734c45e324871efed26d9feffe11146cc9
author Sami Tolvanen <samitolvanen@google.com> Thu Nov 13 17:13:47 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 13 17:13:48 2014 +0000
tree 9daf947af5308aa377aa425791d30cb527e42074
parent 2028b97788ab3723d55270e02658e87e066ad262
parent c95e9da39660f278ace4b14d688dc6818d1a38bf

Merge "Do not mount devices with invalid verity metadata"

fs_mgr/fs_mgr_verity.c

diff --git a/fs_mgr/fs_mgr_verity.c b/fs_mgr/fs_mgr_verity.c
index f02781c..51555a1 100644
--- a/fs_mgr/fs_mgr_verity.c
+++ b/fs_mgr/fs_mgr_verity.c
@@ -378,7 +378,7 @@
 
 int fs_mgr_setup_verity(struct fstab_rec *fstab) {
 
-    int retval = -1;
+    int retval = FS_MGR_SETUP_VERITY_FAIL;
     int fd = -1;
 
     char *verity_blk_name = 0;
@@ -409,6 +409,8 @@
         goto out;
     }
 
+    retval = FS_MGR_SETUP_VERITY_FAIL;
+
     // get the device mapper fd
     if ((fd = open("/dev/device-mapper", O_RDWR)) < 0) {
         ERROR("Error opening device mapper (%s)", strerror(errno));