Skip to content

Misc fixups #72

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

Merged
thaJeztah merged 2 commits into from
Aug 12, 2026
Merged

Misc fixups #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97724ca
fs,fs2: AddPid: stricter subcgroup check
kolyshkin Aug 5, 2026
30ca211
devices: setV2: add missing O_CLOEXEC
kolyshkin Aug 5, 2026
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
2 changes: 1 addition & 1 deletion devices/v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func setV2(dirPath string, r *cgroups.Resources) error {
if err != nil {
return err
}
dirFD, err := unix.Open(dirPath, unix.O_DIRECTORY|unix.O_RDONLY, 0o600)
dirFD, err := unix.Open(dirPath, unix.O_DIRECTORY|unix.O_RDONLY|unix.O_CLOEXEC, 0o600)
if err != nil {
return fmt.Errorf("cannot get dir FD for %s", dirPath)
}
Expand Down
7 changes: 4 additions & 3 deletions fs/fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"fmt"
"os"
"path"
"path/filepath"
"strings"
"sync"

Expand Down Expand Up @@ -153,8 +153,9 @@ func (m *Manager) AddPid(subcgroup string, pid int) (retErr error) {
c := m.cgroups

for _, dir := range m.paths {
path := path.Join(dir, subcgroup)
if !strings.HasPrefix(path, dir) {
path := filepath.Join(dir, subcgroup)
// Make sure path is either dir itself or below it.
if path != dir && !strings.HasPrefix(path, dir+"/") {
return fmt.Errorf("bad sub cgroup path: %s", subcgroup)
}

Expand Down
3 changes: 2 additions & 1 deletion fs2/fs2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ func (m *Manager) Apply(pid int) error {
// a cgroup under under the manager's cgroup.
func (m *Manager) AddPid(subcgroup string, pid int) error {
path := filepath.Join(m.dirPath, subcgroup)
if !strings.HasPrefix(path, m.dirPath) {
// Make sure path is either m.dirPath itself or below it.
if path != m.dirPath && !strings.HasPrefix(path, m.dirPath+"/") {
return fmt.Errorf("bad sub cgroup path: %s", subcgroup)
}

Expand Down