diff options
Diffstat (limited to 'fs_mgr/fs_mgr.c')
| -rw-r--r-- | fs_mgr/fs_mgr.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c index 40878c1..91e6c33 100644 --- a/fs_mgr/fs_mgr.c +++ b/fs_mgr/fs_mgr.c @@ -245,16 +245,6 @@ static int device_is_debuggable() { return strcmp(value, "1") ? 0 : 1; } -static int device_is_secure() { - int ret = -1; - char value[PROP_VALUE_MAX]; - ret = __system_property_get("ro.secure", value); - /* If error, we want to fail secure */ - if (ret < 0) - return 1; - return strcmp(value, "0") ? 1 : 0; -} - /* * Tries to mount any of the consecutive fstab entries that match * the mountpoint of the one given by fstab->recs[start_idx]. @@ -360,11 +350,9 @@ int fs_mgr_mount_all(struct fstab *fstab) wait_for_file(fstab->recs[i].blk_device, WAIT_TIMEOUT); } - if ((fstab->recs[i].fs_mgr_flags & MF_VERIFY) && device_is_secure()) { - int rc = fs_mgr_setup_verity(&fstab->recs[i]); - if (device_is_debuggable() && rc == FS_MGR_SETUP_VERITY_DISABLED) { - INFO("Verity disabled"); - } else if (rc != FS_MGR_SETUP_VERITY_SUCCESS) { + if ((fstab->recs[i].fs_mgr_flags & MF_VERIFY) && + !device_is_debuggable()) { + if (fs_mgr_setup_verity(&fstab->recs[i]) < 0) { ERROR("Could not set up verified partition, skipping!\n"); continue; } @@ -479,11 +467,9 @@ int fs_mgr_do_mount(struct fstab *fstab, char *n_name, char *n_blk_device, fstab->recs[i].mount_point); } - if ((fstab->recs[i].fs_mgr_flags & MF_VERIFY) && device_is_secure()) { - int rc = fs_mgr_setup_verity(&fstab->recs[i]); - if (device_is_debuggable() && rc == FS_MGR_SETUP_VERITY_DISABLED) { - INFO("Verity disabled"); - } else if (rc != FS_MGR_SETUP_VERITY_SUCCESS) { + if ((fstab->recs[i].fs_mgr_flags & MF_VERIFY) && + !device_is_debuggable()) { + if (fs_mgr_setup_verity(&fstab->recs[i]) < 0) { ERROR("Could not set up verified partition, skipping!\n"); continue; } |