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

ueventd: duplicate /dev/ashmem

Browse source 
am: ff89b8d8c2

Change-Id: Ib3b7fc8dd94dcb499f99f3400d483f11cded9fd4
This commit is contained in:
Tri Vo 2019-09-26 11:35:21 -07:00 • committed by android-build-merger
commit 9d177091ef
3 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
init/devices.cpp
View file

@ -441,6 +441,23 @@ void DeviceHandler::HandleDevice(const std::string& action, const std::string& d
}
}
void DeviceHandler::HandleAshmemUevent(const Uevent& uevent) {
if (uevent.device_name == "ashmem") {
static const std::string boot_id_path = "/proc/sys/kernel/random/boot_id";
std::string boot_id;
if (!ReadFileToString(boot_id_path, &boot_id)) {
PLOG(ERROR) << "Cannot duplicate ashmem device node. Failed to read " << boot_id_path;
return;
};
boot_id = Trim(boot_id);
Uevent dup_ashmem_uevent = uevent;
dup_ashmem_uevent.device_name += boot_id;
dup_ashmem_uevent.path += boot_id;
HandleUevent(dup_ashmem_uevent);
}
}
void DeviceHandler::HandleUevent(const Uevent& uevent) {
if (uevent.action == "add" || uevent.action == "change" || uevent.action == "online") {
FixupSysPermissions(uevent.path, uevent.subsystem);
@ -485,6 +502,10 @@ void DeviceHandler::HandleUevent(const Uevent& uevent) {
mkdir_recursive(Dirname(devpath), 0755);
HandleDevice(uevent.action, devpath, block, uevent.major, uevent.minor, links);
// Duplicate /dev/ashmem device and name it /dev/ashmem<boot_id>.
// TODO(b/111903542): remove once all users of /dev/ashmem are migrated to libcutils API.
HandleAshmemUevent(uevent);
}
void DeviceHandler::ColdbootDone() {

1
init/devices.h
View file

@ -130,6 +130,7 @@ class DeviceHandler : public UeventHandler {
void HandleDevice(const std::string& action, const std::string& devpath, bool block, int major,
int minor, const std::vector<std::string>& links) const;
void FixupSysPermissions(const std::string& upath, const std::string& subsystem) const;
void HandleAshmemUevent(const Uevent& uevent);
std::vector<Permissions> dev_permissions_;
std::vector<SysfsPermissions> sysfs_permissions_;

2
rootdir/ueventd.rc
View file

@ -33,7 +33,7 @@ subsystem sound
/dev/urandom 0666 root root
# Make HW RNG readable by group system to let EntropyMixer read it.
/dev/hw_random 0440 root system
/dev/ashmem 0666 root root
/dev/ashmem* 0666 root root
/dev/binder 0666 root root
/dev/hwbinder 0666 root root
/dev/vndbinder 0666 root root