commit 29464e917d2dfca642cf6d6c50a1c5078e3ec87d
author Mike McTernan <mikemcternan@google.com> Fri Aug 23 15:53:59 2024 +0100
committer Mike McTernan <mikemcternan@google.com> Fri Aug 23 16:57:00 2024 +0000
tree fcabea9610a704449863997dc0d717896c70e987
parent 775951241f4d159f7dc0d51764127657aae2d35b

trusty: add return value test for munmap() calls

Ensure the return value of munmap() is checked.

Bug: 361754857
Test: build.py
Change-Id: I3290651897431042bdaa578fcc4e67eb232a50e8

src/main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 54adda4..69ed3b9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -170,7 +170,10 @@
     return NO_ERROR;
 
 err:
-    munmap(shm_base, shm_len);
+    int rc1 = munmap(shm_base, shm_len);
+    if (rc1 != NO_ERROR) {
+        TLOGW("munmap() failed: %d\n", rc1);
+    }
     return rc;
 }
 
@@ -253,7 +256,10 @@
 static void on_channel_cleanup(void* _ctx) {
     struct chan_ctx* ctx = (struct chan_ctx*)_ctx;
     /* Abort operation and free all resources. */
-    munmap(ctx->shm_base, ctx->shm_len);
+    int rc = munmap(ctx->shm_base, ctx->shm_len);
+    if (rc != NO_ERROR) {
+        TLOGW("munmap() failed: %d\n", rc);
+    }
     ctx->op->abort();
     ctx->op.reset();
     free(ctx);