Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8825faf authored by David Anderson's avatar David Anderson
Browse files

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

The chown() call will fix the uid for pre-existing nodes, but not the
gid. This fix ensures the correct gid is set if needed.

Bug: 187738549
Test: manual test modifying ueventd.rc
Change-Id: I0fadd745a7c57a089fed9afc2572ace597a05396
parent 4717129e

init/devices.cpp

+14 −1
Original line number Diff line number Diff line
@@ -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";

    }