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

Merge "overlayfs: Mount overlay with context= fs_options if original mount has it"

Browse source
This commit is contained in:
Yi-yo Chiang 2022-12-14 07:18:06 +00:00 • committed by Gerrit Code Review
commit 3ae0234484
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
fs_mgr/fs_mgr_overlayfs.cpp
View file

@ -116,8 +116,7 @@ std::vector<const std::string> OverlayMountPoints() {
// For non-A/B devices prefer cache backing storage if
// kPreferCacheBackingStorageProp property set.
if (!IsABDevice() &&
android::base::GetBoolProperty(kPreferCacheBackingStorageProp, false) &&
if (!IsABDevice() && android::base::GetBoolProperty(kPreferCacheBackingStorageProp, false) &&
android::base::GetIntProperty("ro.vendor.api_level", -1) < __ANDROID_API_T__) {
return {kCacheMountPoint, kScratchMountPoint};
}
@ -332,8 +331,14 @@ static inline bool KernelSupportsUserXattrs() {
return major > 5 || (major == 5 && minor >= 15);
}
const std::string fs_mgr_mount_point(const std::string& mount_point) {
if ("/"s != mount_point) return mount_point;
return "/system";
}
// default options for mount_point, returns empty string for none available.
std::string fs_mgr_get_overlayfs_options(const std::string& mount_point) {
std::string fs_mgr_get_overlayfs_options(const FstabEntry& entry) {
const auto mount_point = fs_mgr_mount_point(entry.mount_point);
auto candidate = fs_mgr_get_overlayfs_candidate(mount_point);
if (candidate.empty()) return "";
auto ret = kLowerdirOption + mount_point + "," + kUpperdirOption + candidate + kUpperName +
@ -344,14 +349,14 @@ std::string fs_mgr_get_overlayfs_options(const std::string& mount_point) {
if (KernelSupportsUserXattrs()) {
ret += ",userxattr";
}
for (const auto& flag : android::base::Split(entry.fs_options, ",")) {
if (android::base::StartsWith(flag, "context=")) {
ret += "," + flag;
}
}
return ret;
}
const std::string fs_mgr_mount_point(const std::string& mount_point) {
if ("/"s != mount_point) return mount_point;
return "/system";
}
constexpr char kOverlayfsFileContext[] = "u:object_r:overlayfs_file:s0";
class AutoSetFsCreateCon final {
@ -710,8 +715,9 @@ std::vector<mount_info> ReadMountinfoFromFile(const std::string& path) {
return info;
}
bool fs_mgr_overlayfs_mount(const std::string& mount_point) {
auto options = fs_mgr_get_overlayfs_options(mount_point);
bool fs_mgr_overlayfs_mount(const FstabEntry& entry) {
const auto mount_point = fs_mgr_mount_point(entry.mount_point);
const auto options = fs_mgr_get_overlayfs_options(entry);
if (options.empty()) return false;
auto retval = true;
@ -1346,7 +1352,7 @@ bool fs_mgr_overlayfs_mount_all(Fstab* fstab) {
scratch_can_be_mounted = false;
TryMountScratch();
}
ret &= fs_mgr_overlayfs_mount(mount_point);
ret &= fs_mgr_overlayfs_mount(entry);
}
return ret;
}