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

Merge "Fix gid not being set in ueventd when device nodes already exist."

Browse source
This commit is contained in:
David Anderson 2021-07-07 22:06:09 +00:00 • committed by Gerrit Code Review
commit ccea7dfae7
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
init/devices.cpp
View file

@ -264,6 +264,8 @@ void DeviceHandler::MakeDevice(const std::string& path, bool block, int major, i
setfscreatecon(secontext.c_str());
}
gid_t new_group = -1;
dev_t dev = makedev(major, minor);
/* Temporarily change egid to avoid race condition setting the gid of the
* device node. Unforunately changing the euid would prevent creation of
@ -291,10 +293,21 @@ void DeviceHandler::MakeDevice(const std::string& path, bool block, int major, i
PLOG(ERROR) << "Cannot set '" << secontext << "' SELinux label on '" << path
<< "' device";
}
struct stat s;
if (stat(path.c_str(), &s) == 0) {
if (gid != s.st_gid) {
new_group = gid;
}
} else {
PLOG(ERROR) << "Cannot stat " << path;
}
}
out:
chown(path.c_str(), uid, -1);
if (chown(path.c_str(), uid, new_group) < 0) {
PLOG(ERROR) << "Cannot chown " << path << " " << uid << " " << new_group;
}
if (setegid(AID_ROOT)) {
PLOG(FATAL) << "setegid(AID_ROOT) failed";
}