commit ca332ab47ca07ba16861f882d58018c7cb55d94f
author Sami Tolvanen <samitolvanen@google.com> Tue Jun 07 00:01:55 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 07 00:01:56 2016 +0000
tree b3fb209978dd2d0e984b38f176fd62c7a8d9d6ef
parent b6bd97e148136b33ce99ef6453f56d66e3e56542
parent b0ae5ed8a40003479f70a8bde35df491636e527b

Merge "fs_mgr: validate corrected signatures" into nyc-dev

fs_mgr/fs_mgr_verity.cpp

diff --git a/fs_mgr/fs_mgr_verity.cpp b/fs_mgr/fs_mgr_verity.cpp
index b5141c9..719096f 100644
--- a/fs_mgr/fs_mgr_verity.cpp
+++ b/fs_mgr/fs_mgr_verity.cpp
@@ -150,6 +150,18 @@
     return retval;
 }
 
+static int verify_verity_signature(const struct fec_verity_metadata& verity)
+{
+    if (verify_table(verity.signature, verity.table,
+            verity.table_length) == 0 ||
+        verify_table(verity.ecc_signature, verity.table,
+            verity.table_length) == 0) {
+        return 0;
+    }
+
+    return -1;
+}
+
 static int invalidate_table(char *table, size_t table_length)
 {
     size_t n = 0;
@@ -919,8 +931,7 @@
     }
 
     // verify the signature on the table
-    if (verify_table(verity.signature, verity.table,
-            verity.table_length) < 0) {
+    if (verify_verity_signature(verity) < 0) {
         if (params.mode == VERITY_MODE_LOGGING) {
             // the user has been warned, allow mounting without dm-verity
             retval = FS_MGR_SETUP_VERITY_SUCCESS;