tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Check sepolicy context for mounting vendor overlay" am: e0c3a8d97b am: b283b42dc8

Browse source 
am: 925b572d6c

Change-Id: I3f835d3f01226d09275aec1a11602f1dff6d9acf
This commit is contained in:
Justin Yun 2018-11-05 10:35:48 -08:00 committed by android-build-merger
commit 69c90ab4de
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
fs_mgr/fs_mgr_vendor_overlay.cpp
View file

@ -74,16 +74,21 @@ bool fs_mgr_vendor_overlay_mount(const std::string& overlay_top, const std::stri
const auto vendor_mount_point = kVendorTopDir + mount_point;
LINFO << "vendor overlay mount on " << vendor_mount_point;
auto context = fs_mgr_get_context(vendor_mount_point);
if (!context.empty()) {
context = ",rootcontext="s + context;
} else {
PERROR << " result: cannot find the mount point";
const auto target_context = fs_mgr_get_context(vendor_mount_point);
if (target_context.empty()) {
PERROR << " failed: cannot find the target vendor mount point";
return false;
}
const auto source_directory = overlay_top + "/" + mount_point;
const auto source_context = fs_mgr_get_context(source_directory);
if (target_context != source_context) {
LERROR << " failed: source and target contexts do not match (source:" << source_context
<< ", target:" << target_context << ")";
return false;
}
auto options = "override_creds=off,"s + kLowerdirOption + overlay_top + "/" + mount_point +
":" + vendor_mount_point + context;
auto options =
"override_creds=off,"s + kLowerdirOption + source_directory + ":" + vendor_mount_point;
auto report = "__mount(source=overlay,target="s + vendor_mount_point + ",type=overlay," +
options + ")=";
auto ret = mount("overlay", vendor_mount_point.c_str(), "overlay", MS_RDONLY | MS_RELATIME,