trusty:storage: add missing NULL check to prevent RAM dump

file_get_info() may return NULL on a failed transaction, so check for this to avoid a possible NULL pointer access.

Bug: 325770752
Test: build.py, run storage tests
Change-Id: Id59edb940a6fa98f45d5d557572644d7a1f923e0

2 files changed, 10 insertions, 1 deletions

diff --git a/client.c b/client.c
index b073302..2b8d057 100644
--- a/client.c
+++ b/client.c
@@ -906,6 +906,11 @@ static bool storage_file_list_iter(struct file_iterate_state* iter,
     struct obj_ref ref = OBJ_REF_INITIAL_VALUE(ref);
 
     file_info = file_get_info(tr, block_mac, &ref);
+    if (!file_info) {
+        printf("can't read file entry at %" PRIu64 "\n",
+               block_mac_to_block(tr, block_mac));
+        return true;
+    }
 
     if (strncmp(file_info->path, miter->prefix, miter->prefix_len) == 0) {
         storage_file_list_add(miter,
@@ -1092,4 +1097,4 @@ enum storage_err storage_file_set_size(struct storage_client_session* session,
     }
 
     return STORAGE_NO_ERROR;
-}
\ No newline at end of file
+}
diff --git a/file.c b/file.c
index 16a64f7..2248f96 100644
--- a/file.c
+++ b/file.c
@@ -955,6 +955,10 @@ enum file_op_result file_iterate(struct transaction* tr,
         }
 
         stop = state->file(state, tr, &block_mac, added, removed);
+
+        if (tr->failed) {
+            return FILE_OP_ERR_FAILED;
+        }
         if (stop) {
             return FILE_OP_SUCCESS;
         }