tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 4e359e1d: Merge "fs_mgr: Use ro.boot.veritymode"

Browse source 
* commit '4e359e1da351e1a99e789bc7a9f7e4da0d1fab27':
  fs_mgr: Use ro.boot.veritymode
This commit is contained in:
Sami Tolvanen 2015-06-10 17:05:41 +00:00 committed by Android Git Automerger
commit ecad7587ac
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
fs_mgr/fs_mgr_verity.c
View file

@ -767,8 +767,24 @@ static int get_verity_state_offset(struct fstab_rec *fstab, off64_t *offset)
static int load_verity_state(struct fstab_rec *fstab, int *mode)
{
off64_t offset = 0;
char propbuf[PROPERTY_VALUE_MAX];
int match = 0;
off64_t offset = 0;
/* use the kernel parameter if set */
property_get("ro.boot.veritymode", propbuf, "");
if (*propbuf != '\0') {
if (!strcmp(propbuf, "enforcing")) {
*mode = VERITY_MODE_DEFAULT;
return 0;
} else if (!strcmp(propbuf, "logging")) {
*mode = VERITY_MODE_LOGGING;
return 0;
} else {
INFO("Unknown value %s for veritymode; ignoring", propbuf);
}
}
if (get_verity_state_offset(fstab, &offset) < 0) {
/* fall back to stateless behavior */
@ -855,6 +871,13 @@ int fs_mgr_update_verity_state(fs_mgr_verity_state_callback callback)
struct dm_ioctl *io = (struct dm_ioctl *) buffer;
struct fstab *fstab = NULL;
/* check if we need to store the state */
property_get("ro.boot.veritymode", propbuf, "");
if (*propbuf != '\0') {
return 0; /* state is kept by the bootloader */
}
fd = TEMP_FAILURE_RETRY(open("/dev/device-mapper", O_RDWR | O_CLOEXEC));
if (fd == -1) {