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
This commit is contained in:
Sami Tolvanen 2014-11-14 00:03:41 +00:00 committed by Android Git Automerger
commit 99184bab35

View file

@ -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));