ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fs_mgr: Fix disable-verity for verifyatboot partitions am: dd78ae75ff

Browse source 
am: afa252cc40

Change-Id: I464a044ba086aa26d3f5afd799c3c76043f833cb
This commit is contained in:
Prashant Malani 2016-11-16 21:15:08 +00:00 • committed by android-build-merger
commit 019eab30ac
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fs_mgr/fs_mgr_verity.cpp
View file

@ -825,7 +825,7 @@ int fs_mgr_update_verity_state(fs_mgr_verity_state_callback callback)
char fstab_filename[PROPERTY_VALUE_MAX + sizeof(FSTAB_PREFIX)];
const char *mount_point;
char propbuf[PROPERTY_VALUE_MAX];
char *status;
const char *status;
int fd = -1;
int i;
int mode;
@ -875,9 +875,13 @@ int fs_mgr_update_verity_state(fs_mgr_verity_state_callback callback)
verity_ioctl_init(io, mount_point, 0);
if (ioctl(fd, DM_TABLE_STATUS, io)) {
ERROR("Failed to query DM_TABLE_STATUS for %s (%s)\n", mount_point,
strerror(errno));
continue;
if (fstab->recs[i].fs_mgr_flags & MF_VERIFYATBOOT) {
status = "V";
} else {
ERROR("Failed to query DM_TABLE_STATUS for %s (%s)\n", mount_point,
strerror(errno));
continue;
}
}
status = &buffer[io->data_start + sizeof(struct dm_target_spec)];
@ -937,11 +941,11 @@ int fs_mgr_setup_verity(struct fstab_rec *fstab)
struct fec_handle *f = NULL;
struct fec_verity_metadata verity;
struct verity_table_params params = { .table = NULL };
bool verified_at_boot = false;
alignas(dm_ioctl) char buffer[DM_BUF_SIZE];
struct dm_ioctl *io = (struct dm_ioctl *) buffer;
char *mount_point = basename(fstab->mount_point);
bool verified_at_boot = false;
if (fec_open(&f, fstab->blk_device, O_RDONLY, FEC_VERITY_DISABLE,
FEC_DEFAULT_ROOTS) < 0) {