pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove /dev/selinux directory creation from first_stage_init.cpp 

Follow-up from aosp/2203897

Bug: 243923977
Test: m and manual verification
Change-Id: I9e41301d2fe4447906253a5c1249dc6c25cd5218
This commit is contained in:
Sandro 2022-09-07 14:56:39 +00:00
parent 344f71605c
commit d01921034c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
init/first_stage_init.cpp
View File

@ -295,9 +295,6 @@ int FirstStageMain(int argc, char** argv) {
// stage init // stage init
CHECKCALL(mount("tmpfs", kSecondStageRes, "tmpfs", MS_NOEXEC | MS_NOSUID | MS_NODEV, CHECKCALL(mount("tmpfs", kSecondStageRes, "tmpfs", MS_NOEXEC | MS_NOSUID | MS_NODEV,
"mode=0755,uid=0,gid=0")) "mode=0755,uid=0,gid=0"))
// First stage init stores Mainline sepolicy here.
CHECKCALL(mkdir("/dev/selinux", 0744));
#undef CHECKCALL #undef CHECKCALL
SetStdioToDevNull(argv); SetStdioToDevNull(argv);

5
init/selinux.cpp
View File

@ -525,7 +525,7 @@ const std::vector<std::string> kApexSepolicy{"apex_file_contexts", "apex_propert
"apex_service_contexts", "apex_seapp_contexts", "apex_service_contexts", "apex_seapp_contexts",
"apex_test"}; "apex_test"};
Result<void> CreateTmpfsDirIfNeeded() { Result<void> CreateTmpfsDir() {
mode_t mode = 0744; mode_t mode = 0744;
struct stat stat_data; struct stat stat_data;
if (stat(kTmpfsDir.c_str(), &stat_data) != 0) { if (stat(kTmpfsDir.c_str(), &stat_data) != 0) {
@ -539,6 +539,7 @@ Result<void> CreateTmpfsDirIfNeeded() {
if (!S_ISDIR(stat_data.st_mode)) { if (!S_ISDIR(stat_data.st_mode)) {
return Error() << kTmpfsDir << " exists and is not a directory."; return Error() << kTmpfsDir << " exists and is not a directory.";
} }
LOG(WARNING) << "Directory " << kTmpfsDir << " already exists";
} }
// Need to manually call chmod because mkdir will create a folder with // Need to manually call chmod because mkdir will create a folder with
@ -593,7 +594,7 @@ Result<void> GetPolicyFromApex(const std::string& dir) {
auto handle_guard = android::base::make_scope_guard([&handle] { CloseArchive(handle); }); auto handle_guard = android::base::make_scope_guard([&handle] { CloseArchive(handle); });
auto create = CreateTmpfsDirIfNeeded(); auto create = CreateTmpfsDir();
if (!create.ok()) { if (!create.ok()) {
return create.error(); return create.error();
} }