commit e179157dc543cb4b94479fe069c8c7b2228ed71c
author David Anderson <dvander@google.com> Fri Nov 05 18:57:49 2021 -0700
committer David Anderson <dvander@google.com> Mon Nov 08 13:22:53 2021 -0800
tree cdc3820070df7ae858fb38d67b77af7b46c7c2f9
parent 2a89e7c5778c77d9a01812fb6f9e0ad733ba99d5

Improve vold logging.

This patch adds more error logging to mountFstab. In a few cases, the
were error paths with no existing error logs. In other cases, the log
messages are there to help understand error flow in logs (for example
when a function with lots of error paths returns false).

Bug: 205314634
Test: treehugger builds
Change-Id: I464edc6e74ea0d7419ee9d9b75fd238752c13f4f

KeyUtil.cpp

diff --git a/KeyUtil.cpp b/KeyUtil.cpp
index 2f9c876..25d5af3 100644
--- a/KeyUtil.cpp
+++ b/KeyUtil.cpp
@@ -54,7 +54,10 @@
 }
 
 bool generateStorageKey(const KeyGeneration& gen, KeyBuffer* key) {
-    if (!gen.allow_gen) return false;
+    if (!gen.allow_gen) {
+        LOG(ERROR) << "Generating storage key not allowed";
+        return false;
+    }
     if (gen.use_hw_wrapped_key) {
         if (gen.keysize != FSCRYPT_MAX_KEY_SIZE) {
             LOG(ERROR) << "Cannot generate a wrapped key " << gen.keysize << " bytes long";