commit 9e541447dd13d47fd2d3428fa32c6e49f65dbb54
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Feb 21 08:45:30 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 08:45:30 2025 -0800
tree a3bfca99d51f2fb7f6ab8339ba12459b1d0e7cbe
parent 050f1c5b66b85f4fd5c5a18746108f97b7ac9bc9
parent 3250a0a259ae672d36b6ab44f82a75a1bbad33a6

Merge "Preserve environment when launching overlay_remounter" into main am: 3250a0a259

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3503057

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

init/selinux.cpp

diff --git a/init/selinux.cpp b/init/selinux.cpp
index 8bdf5b6..2a27c1d 100644
--- a/init/selinux.cpp
+++ b/init/selinux.cpp
@@ -749,7 +749,7 @@
         PLOG(FATAL) << "Failed to unlink " << or_dest;
     }
     const char* args[] = {or_dest.c_str(), nullptr};
-    fexecve(dest.get(), const_cast<char**>(args), nullptr);
+    fexecve(dest.get(), const_cast<char**>(args), environ);
 
     // execv() only returns if an error happened, in which case we
     // panic and never return from this function.