Merge "Do not mount devices with invalid verity metadata" (3e531973) · Commits · e / os / android_system_core

fs_mgr/fs_mgr_verity.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -378,7 +378,7 @@ static int set_verified_property(char *name) {

		int fs_mgr_setup_verity(struct fstab_rec *fstab) {

		int retval = -1;
		int retval = FS_MGR_SETUP_VERITY_FAIL;
		int fd = -1;

		char *verity_blk_name = 0;
		@@ -409,6 +409,8 @@ int fs_mgr_setup_verity(struct fstab_rec *fstab) {
		goto out;
		}

		retval = FS_MGR_SETUP_VERITY_FAIL;

		// get the device mapper fd
		if ((fd = open("/dev/device-mapper", O_RDWR)) < 0) {
		ERROR("Error opening device mapper (%s)", strerror(errno));