Merge "DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket" into lmp-dev am: 40138b630c -s ours am: 65e59a4960 am: fb3d3904d0 -s ours am: 4b9c44dcf7 am: cc236b7e94 am: 76af41ef0a am: 18b8b0f168 -s ours am: 3ef91bbffa am: 0da14e91c6 am: 5e10383130 am: 80dc7605b9
am: 8727b53a2f
Change-Id: I5b603d29528d6cb6eb0ee8c734a1ed9273fe094d
diff --git a/fs_mgr/fs_mgr_verity.cpp b/fs_mgr/fs_mgr_verity.cpp
index bec5eec..bb61b93 100644
--- a/fs_mgr/fs_mgr_verity.cpp
+++ b/fs_mgr/fs_mgr_verity.cpp
@@ -825,7 +825,7 @@
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 @@
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)];