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

Commit 3a58e485 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libprocessgroup: Reject JoinCgroup actions for v2 controllers" into... 

Merge "libprocessgroup: Reject JoinCgroup actions for v2 controllers" into main am: c049af4e am: c497737d am: 2686319f

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



Change-Id: I04f798a5c0d52d60de765e3578e7fcb12bba547e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc5c55d8 2686319f

libprocessgroup/task_profiles.cpp

+7 −1
Original line number Diff line number Diff line
@@ -868,7 +868,13 @@ bool TaskProfiles::Load(const CgroupMap& cg_map, const std::string& file_name) { 


                auto controller = cg_map.FindController(controller_name);

                if (controller.HasValue()) {

                    if (controller.version() == 1) {

                        profile->Add(std::make_unique<SetCgroupAction>(controller, path));

                    } else {

                        LOG(WARNING) << "A JoinCgroup action in the " << profile_name

                                     << " profile is used for controller " << controller_name

                                     << " in the cgroup v2 hierarchy and will be ignored";

                    }

                } else {

                    LOG(WARNING) << "JoinCgroup: controller " << controller_name << " is not found";

                }