diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2014-11-14 00:03:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-14 00:03:41 +0000 |
| commit | 99184bab35c0b88dfc70c8be1d88cfb100dbf4cd (patch) | |
| tree | 3e7a029bce15b7a778526622cf92b3450a6cf00c /fs_mgr | |
| parent | 2dfadac1569126d72b2da42233afc908b7ec10a7 (diff) | |
| parent | 72f0d92c722447e0c87cfe765516a7352db3d51a (diff) | |
| download | core-99184bab35c0b88dfc70c8be1d88cfb100dbf4cd.tar.gz core-99184bab35c0b88dfc70c8be1d88cfb100dbf4cd.tar.bz2 core-99184bab35c0b88dfc70c8be1d88cfb100dbf4cd.zip | |
am 72f0d92c: DO NOT MERGE: Do not mount devices with invalid verity metadata
* commit '72f0d92c722447e0c87cfe765516a7352db3d51a':
DO NOT MERGE: Do not mount devices with invalid verity metadata
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/fs_mgr_verity.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs_mgr/fs_mgr_verity.c b/fs_mgr/fs_mgr_verity.c index f02781cb7..51555a152 100644 --- a/fs_mgr/fs_mgr_verity.c +++ b/fs_mgr/fs_mgr_verity.c @@ -378,7 +378,7 @@ static int set_verified_property(char *name) { 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 @@ int fs_mgr_setup_verity(struct fstab_rec *fstab) { 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)); |