commit c26bf3150cab3b51289c0ae19d007a21e8a5d724
author Andreas Huber <andih@google.com> Mon Aug 21 17:33:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 21 17:33:56 2017 +0000
tree 400bbec2b61644a8c011d1945002ab2078ef9b11
parent 6ccdcfc96881cf70958502ffad3758439c3e8982
parent 9f817282994f99ac275b2642a1a97565310c9538

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

Change-Id: I3eac4b22b885e7991256e5a7df8f37e6b9a10cce

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,