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

Merge "Remove /dev/selinux directory creation from first_stage_init.cpp" am: 4b3c063ac3 am: 8ee78c7c3a

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

Change-Id: I069e9509c1b83958aaff90b8a43b310badaa76f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sandro Montanari 2022-09-08 12:10:06 +00:00 • committed by Automerger Merge Worker
commit db4f04cc6b
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();
} }