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

Commit 2713e06b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "remount: Auto remount option (-R) also tries to gain root" into main... 

Merge "remount: Auto remount option (-R) also tries to gain root" into main am: eadf6b4b am: 69016753

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2926792



Change-Id: I481e36393649c8ba44cb401366da3e89ae2a3eb5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 309d5e56 69016753

fs_mgr/fs_mgr_remount.cpp

+14 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <fstab/fstab.h>

#include <libavb_user/libavb_user.h>

#include <libgsi/libgsid.h>

#include <private/android_filesystem_config.h>



#include "fs_mgr_overlayfs_control.h"

#include "fs_mgr_overlayfs_mount.h"
@@ -608,7 +609,19 @@ int main(int argc, char* argv[]) { 
    }



    // Make sure we are root.

    if (::getuid() != 0) {

    if (const auto uid = ::getuid(); uid != AID_ROOT) {

        // If requesting auto reboot, also try to auto gain root.

        if (auto_reboot && uid == AID_SHELL && access("/system/xbin/su", F_OK) == 0) {

            std::vector<char*> args{const_cast<char*>("/system/xbin/su"),

                                    const_cast<char*>("root")};

            for (int i = 0; i < argc; ++i) {

                args.push_back(argv[i]);

            }

            args.push_back(nullptr);

            LOG(INFO) << "Attempting to gain root with \"su root\"";

            execv(args[0], args.data());

            PLOG(ERROR) << "Failed to execute \"su root\"";

        }

        LOG(ERROR) << "Not running as root. Try \"adb root\" first.";

        return EXIT_FAILURE;

    }