Commit 72f0d92c authored Nov 07, 2014 by Sami Tolvanen Committed by Iliyan Malchev Nov 13, 2014

DO NOT MERGE: Do not mount devices with invalid verity metadata

The return value of read_verity_metadata is propagated to caller
even if the verity metadata is invalid, provided that it can be
read from the device. This results in devices with invalid verity
metadata signatures to be mounted normally, which is not desirable.
This change fixes the bug by changing the return value in case of
verification failure to FS_MGR_SETUP_VERITY_FAIL.

Bug: 15984840
Bug: 18120110
Change-Id: Ic29f37a23cb417c2538d60fb05de9dd310d50f4a
(cherry picked from commit c95e9da3)

parent 9573a13b

fs_mgr/fs_mgr_verity.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -376,7 +376,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;
		@@ -407,6 +407,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));