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

Merge "Use genfs labels version library" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-11-21 02:45:16 +00:00 • committed by Gerrit Code Review
commit 1c1bdd91b3
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
init/Android.bp
View file

@ -176,6 +176,7 @@ libinit_cc_defaults {
"libxml2", "libxml2",
"lib_apex_manifest_proto_lite", "lib_apex_manifest_proto_lite",
"update_metadata-protos", "update_metadata-protos",
"libgenfslabelsversion.ffi",
], ],
shared_libs: [ shared_libs: [
"libbase", "libbase",

22
init/selinux.cpp
View file

@ -69,6 +69,7 @@
#include <android/avf_cc_flags.h> #include <android/avf_cc_flags.h>
#include <fs_avb/fs_avb.h> #include <fs_avb/fs_avb.h>
#include <fs_mgr.h> #include <fs_mgr.h>
#include <genfslabelsversion.h>
#include <libgsi/libgsi.h> #include <libgsi/libgsi.h>
#include <libsnapshot/snapshot.h> #include <libsnapshot/snapshot.h>
#include <selinux/android.h> #include <selinux/android.h>
@ -190,22 +191,6 @@ bool GetVendorMappingVersion(std::string* plat_vers) {
return true; return true;
} }
int GetVendorGenfsVersion() {
std::string line;
if (!ReadFirstLine("/vendor/etc/selinux/genfs_labels_version.txt", &line)) {
PLOG(ERROR) << "Failed to read /vendor/etc/selinux/genfs_labels_version.txt; assuming it's "
"202404";
return 202404;
}
int version;
if (!ParseInt(line, &version)) {
PLOG(ERROR) << "Failed to parse the genfs labels version " << line
<< "; assuming it's 202404";
return 202404;
}
return version;
}
constexpr const char plat_policy_cil_file[] = "/system/etc/selinux/plat_sepolicy.cil"; constexpr const char plat_policy_cil_file[] = "/system/etc/selinux/plat_sepolicy.cil";
bool IsSplitPolicyDevice() { bool IsSplitPolicyDevice() {
@ -342,11 +327,14 @@ bool OpenSplitPolicy(PolicyFile* policy_file) {
std::vector<std::string> genfs_cil_files; std::vector<std::string> genfs_cil_files;
int vendor_genfs_version = GetVendorGenfsVersion(); int vendor_genfs_version = get_genfs_labels_version();
std::string genfs_cil_file = std::string genfs_cil_file =
std::format("/system/etc/selinux/plat_sepolicy_genfs_{}.cil", vendor_genfs_version); std::format("/system/etc/selinux/plat_sepolicy_genfs_{}.cil", vendor_genfs_version);
if (access(genfs_cil_file.c_str(), F_OK) != 0) { if (access(genfs_cil_file.c_str(), F_OK) != 0) {
LOG(INFO) << "Missing " << genfs_cil_file << "; skipping";
genfs_cil_file.clear(); genfs_cil_file.clear();
} else {
LOG(INFO) << "Using " << genfs_cil_file << " for genfs labels";
} }
// clang-format off // clang-format off