ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix use-after-free of stack-allocated temporary string."

Browse source
This commit is contained in:
Andreas Huber 2017-08-21 17:31:02 +00:00 • committed by Gerrit Code Review
commit 4bcccdf998
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
init/selinux.cpp
View file

@ -277,13 +277,15 @@ bool LoadSplitPolicy() {
return false;
}
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",
// 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(),
"/system/etc/selinux/mapping_sepolicy.cil",
"/vendor/etc/selinux/nonplat_sepolicy.cil",
"-o", compiled_sepolicy,