commit 91567d79bd04508f800e19a13aa05a42014da544
author Peiyong Lin <lpy@google.com> Fri May 19 00:39:05 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 19 00:39:05 2023 +0000
tree e878934a70cd94038aa5bc5b59133ebd9aaaa60f
parent e2e9d546df5b6f43fc35cca19a3523e498088f5b
parent c034b3a9bc122e4df4f5ebadf45c585612ef80d3

Merge "Do not allow wildcard matching in GL loader."

cmds/servicemanager/main.cpp

diff --git a/cmds/servicemanager/main.cpp b/cmds/servicemanager/main.cpp
index 520d6f9..86a45e61 100644
--- a/cmds/servicemanager/main.cpp
+++ b/cmds/servicemanager/main.cpp
@@ -132,8 +132,7 @@
 
     IPCThreadState::self()->setTheContextObject(manager);
     if (!ps->becomeContextManager()) {
-        LOG(ERROR) << "Could not become context manager";
-        // TODO(b/280514080): fatal
+        LOG(FATAL) << "Could not become context manager";
     }
 
     sp<Looper> looper = Looper::prepare(false /*allowNonCallbacks*/);

libs/binder/MemoryHeapBase.cpp

diff --git a/libs/binder/MemoryHeapBase.cpp b/libs/binder/MemoryHeapBase.cpp
index 8fe1d2b..3da06ba 100644
--- a/libs/binder/MemoryHeapBase.cpp
+++ b/libs/binder/MemoryHeapBase.cpp
@@ -78,7 +78,7 @@
         if (SEAL_FLAGS && (fcntl(fd, F_ADD_SEALS, SEAL_FLAGS) == -1)) {
             ALOGE("MemoryHeapBase: MemFD %s sealing with flags %x failed with error  %s", name,
                   SEAL_FLAGS, strerror(errno));
-            munmap(mBase, mSize);
+            if (mNeedUnmap) munmap(mBase, mSize);
             mBase = nullptr;
             mSize = 0;
             close(fd);