commit a98256f74c117b1e925fbd42dda666226cf657c3
author Mike McTernan <mikemcternan@google.com> Wed Aug 28 21:33:26 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 28 21:33:26 2024 +0000
tree e083b8dfea0a9dc2facf4ddc183107492201391a
parent dfe2a2771c96cef2d6e29e3be8e4e712363b0470
parent 7153373983e86704d8f35914c4cefb8eadbd8aa4

Merge "Mark the return of munmap() as unused." into main am: 7153373983

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3244900

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

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index e8fe555..4b7af45 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1725,7 +1725,9 @@
                 }
             }
         }
-        ::munmap(ptr, len);
+        if (::munmap(ptr, len) == -1) {
+            ALOGW("munmap() failed: %s", strerror(errno));
+        }
     }
     ::close(fd);
     return status;
@@ -3332,7 +3334,9 @@
 
 void Parcel::Blob::release() {
     if (mFd != -1 && mData) {
-        ::munmap(mData, mSize);
+        if (::munmap(mData, mSize) == -1) {
+            ALOGW("munmap() failed: %s", strerror(errno));
+        }
     }
     clear();
 }