Merge "fs_mgr: Use ro.boot.veritymode" into mnc-dr-dev (eb528dd5) · Commits · e / os / android_system_core

fs_mgr/fs_mgr_verity.c

+24 −1

Original line number	Diff line number	Diff line
		@@ -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) {