Skip to content

libct/cg: skip hidden ones when parsing cgroup mounts #3890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

libct/cg: skip hidden ones when parsing cgroup mounts #3890

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions libcontainer/cgroups/v1_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"os"
"path/filepath"
"sort"
"strings"
"sync"
"syscall"
Expand Down Expand Up @@ -165,7 +166,22 @@ func (m Mount) GetOwnCgroup(cgroups map[string]string) (string, error) {
func getCgroupMountsHelper(ss map[string]bool, mounts []*mountinfo.Info, all bool) ([]Mount, error) {
res := make([]Mount, 0, len(ss))
numFound := 0
parentIDs := make([]int, 0, len(mounts))
for _, mi := range mounts {
parentIDs = append(parentIDs, mi.Parent)
}

sort.Slice(parentIDs, func(i, j int) bool {
return parentIDs[i] < parentIDs[j]
})

for _, mi := range mounts {
// This mount is hidden by other mount
// at the same mountpoint, so skip it.
if sort.SearchInts(parentIDs, mi.ID) < len(parentIDs) {
continue
}

m := Mount{
Mountpoint: mi.Mountpoint,
Root: mi.Root,
Expand Down