commit 841abe201b8f554bc1b3f5be0b79075cad41736d
author Mike McTernan <mikemcternan@google.com> Mon Aug 26 10:12:01 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 26 10:12:01 2024 +0000
tree 979e1da2bbd16c6c42ce476796954c5481c452ab
parent 68911eec66b7d9b7e6de61ec7e3e8d3d4ff245ed
parent 00f0e3f2f74863fc4160e3ea75f5402411726d9e

trusty: add return value test for munmap() calls am: 29464e917d am: 00f0e3f2f7

Original change: https://android-review.googlesource.com/c/trusty/app/confirmationui/+/3239335

Change-Id: I08ae6df48ad2194d24cd2895553202bfc1dc15b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 7c1ddec..a69f228 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);