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

Merge "fs_mgr: Fix disable-verity for verifyatboot partitions"

Browse source
This commit is contained in:
Treehugger Robot 2017-01-12 18:00:33 +00:00 • committed by Gerrit Code Review
commit 6bc1d38381
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
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)]; char fstab_filename[PROPERTY_VALUE_MAX + sizeof(FSTAB_PREFIX)];
const char *mount_point; const char *mount_point;
char propbuf[PROPERTY_VALUE_MAX]; char propbuf[PROPERTY_VALUE_MAX];
char *status; const char *status;
int fd = -1; int fd = -1;
int i; int i;
int mode; 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); verity_ioctl_init(io, mount_point, 0);
if (ioctl(fd, DM_TABLE_STATUS, io)) { if (ioctl(fd, DM_TABLE_STATUS, io)) {
ERROR("Failed to query DM_TABLE_STATUS for %s (%s)\n", mount_point, if (fstab->recs[i].fs_mgr_flags & MF_VERIFYATBOOT) {
strerror(errno)); status = "V";
continue; } 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)]; status = &buffer[io->data_start + sizeof(struct dm_target_spec)];