commit 39a6ce1c75586758ac699d0e5f48c78589116083
author Andreas Huber <andih@google.com> Mon Aug 21 17:40:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 21 17:40:57 2017 +0000
tree f8aea792610b2263a37de068a17334544791cdb3
parent 39ff70fac4d09e4ace186d05791fcaa3cf0c7a12
parent c26bf3150cab3b51289c0ae19d007a21e8a5d724

Fix use-after-free of stack-allocated temporary string. am: c41b838baa
am: a5efddda90

Change-Id: Ic0871bfae738d3b1854a7543843c0a9cc72c049d

init/selinux.cpp

diff --git a/init/selinux.cpp b/init/selinux.cpp
index 291b969..c824028 100644
--- a/init/selinux.cpp
+++ b/init/selinux.cpp
@@ -295,13 +295,15 @@
         return false;
     }
     std::string mapping_file("/system/etc/selinux/mapping/" + vend_plat_vers + ".cil");
+    const std::string version_as_string = std::to_string(max_policy_version);
+
     // clang-format off
     const char* compile_args[] = {
         "/system/bin/secilc",
         plat_policy_cil_file,
         "-M", "true", "-G", "-N",
         // Target the highest policy language version supported by the kernel
-        "-c", std::to_string(max_policy_version).c_str(),
+        "-c", version_as_string.c_str(),
         mapping_file.c_str(),
         "/vendor/etc/selinux/nonplat_sepolicy.cil",
         "-o", compiled_sepolicy,