openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move restorecon() of /sys from init to ueventd. 

ueventd already does restorecon() for /sys/{block,class,devices}, so
instead of duplicating this effort with init, move the restorecon()
that init does for all of /sys to ueventd.

Bug: 62420036
Change-Id: I6125f8ff5316a0cf45872d1100d089d71802958f
Merged-In: I6125f8ff5316a0cf45872d1100d089d71802958f
Test: Boot sailfish, bullhead
This commit is contained in:
Tom Cherry 2017-06-07 14:32:30 -07:00
parent d105aa8496
commit d2fd54e0ff
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
init/init.cpp
View File

@ -880,7 +880,6 @@ static void selinux_restore_context() {
selinux_android_restorecon("/dev/__properties__", 0);
selinux_android_restorecon("/plat_property_contexts", 0);
selinux_android_restorecon("/nonplat_property_contexts", 0);
selinux_android_restorecon("/sys", SELINUX_ANDROID_RESTORECON_RECURSE);
selinux_android_restorecon("/dev/block", SELINUX_ANDROID_RESTORECON_RECURSE);
selinux_android_restorecon("/dev/device-mapper", 0);

2
init/uevent_listener.cpp
View File

@ -165,7 +165,7 @@ RegenerationAction UeventListener::RegenerateUeventsForPath(const std::string& p
return RegenerateUeventsForDir(d.get(), callback);
}
const char* kRegenerationPaths[] = {"/sys/class", "/sys/block", "/sys/devices"};
static const char* kRegenerationPaths[] = {"/sys/class", "/sys/block", "/sys/devices"};
void UeventListener::RegenerateUevents(RegenerateCallback callback) const {
for (const auto path : kRegenerationPaths) {

2
init/uevent_listener.h
View File

@ -35,8 +35,6 @@ enum class RegenerationAction {
using RegenerateCallback = std::function<RegenerationAction(const Uevent&)>;
using PollCallback = std::function<void(const Uevent&)>;
extern const char* kRegenerationPaths[3];
class UeventListener {
public:
UeventListener();

4
init/ueventd.cpp
View File

@ -174,9 +174,7 @@ void ColdBoot::ForkSubProcesses() {
}
void ColdBoot::DoRestoreCon() {
for (const char* path : kRegenerationPaths) {
selinux_android_restorecon(path, SELINUX_ANDROID_RESTORECON_RECURSE);
}
selinux_android_restorecon("/sys", SELINUX_ANDROID_RESTORECON_RECURSE);
device_handler_.set_skip_restorecon(false);
}