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

Commit 352ae2d2 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Tom Cherry
Browse files

Stop & Resume property service when switching to bootstrap namespace 

Test: atest CtsUserspaceRebootHostSideTestCases
Bug: 148236233
Bug: 149745936
Merged-In: I9d30b75f4b4177175ce086c3b6a7c0bba9a17396
Change-Id: I9d30b75f4b4177175ce086c3b6a7c0bba9a17396
(cherry picked from commit 6963f81a)
parent d2dab830

init/mount_namespace.cpp

+10 −0
Original line number Diff line number Diff line
@@ -323,10 +323,20 @@ bool SwitchToBootstrapMountNamespaceIfNeeded() { 
    }

    if (bootstrap_ns_id != GetMountNamespaceId() && bootstrap_ns_fd.get() != -1 &&

        IsApexUpdatable()) {

        // The property service thread and its descendent threads must be in the correct mount

        // namespace to call Service::Start(), however setns() only operates on a single thread and

        // fails when secondary threads attempt to join the same mount namespace.  Therefore, we

        // must join the property service thread and its descendents before the setns() call.  Those

        // threads are then started again after the setns() call, and they'll be in the proper

        // namespace.

        PausePropertyService();



        if (setns(bootstrap_ns_fd.get(), CLONE_NEWNS) == -1) {

            PLOG(ERROR) << "Failed to switch to bootstrap mount namespace.";

            return false;

        }



        ResumePropertyService();

    }

    return true;

}