commit e245ca04b85d0fba2af5a0e4e64673656707cb23
author Linux Build Service Account <lnxbuild@localhost> Wed Sep 30 21:04:50 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 30 21:04:50 2015 -0700
tree ce79ad54c4c75b6089e3ba29a798237058d479e6
parent 6d8f2b66f31b9afa234821ca50eaac489bce15f1
parent 7d8bb9a9f668f16741a6264900c085abdb6469de

Merge "app: aboot: Assert if devinfo is corrupted"

app/aboot/aboot.c

diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index 5067181..a20bb86 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -326,6 +326,11 @@
 
 #if VERIFIED_BOOT
 	cmdline_len += strlen(verified_state) + strlen(vbsn[boot_state].name);
+	if ((device.verity_mode != 0 ) && (device.verity_mode != 1))
+	{
+		dprintf(CRITICAL, "Devinfo paritition possibly corrupted!!!. Please erase devinfo partition to continue booting\n");
+		ASSERT(0);
+	}
 	cmdline_len += strlen(verity_mode) + strlen(vbvm[device.verity_mode].name);
 #endif
 
@@ -451,6 +456,11 @@
 		if(have_cmdline) --dst;
 		while ((*dst++ = *src++));
 
+		if ((device.verity_mode != 0 ) && (device.verity_mode != 1))
+		{
+			dprintf(CRITICAL, "Devinfo paritition possibly corrupted!!!. Please erase devinfo partition to continue booting\n");
+			ASSERT(0);
+		}
 		src = verity_mode;
 		if(have_cmdline) --dst;
 		while ((*dst++ = *src++));