Skip to content
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.

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

capability: use pr_CAP_AMBIENT_CLEAR_ALL to reduce pr_CAP_AMBIENT_LOWER syscall #164

Merged
merged 2 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions capability/capability_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -364,12 +364,16 @@ func (c *capsV3) Apply(kind CapType) (err error) {
}

if kind&AMBS == AMBS {
err = prctl(pr_CAP_AMBIENT, pr_CAP_AMBIENT_CLEAR_ALL, 0, 0, 0)
if err != nil && err != syscall.EINVAL { //nolint:errorlint // Errors from syscall are bare.
// Ignore EINVAL as not supported on kernels before 4.3
return
}
for i := Cap(0); i <= last; i++ {
action := pr_CAP_AMBIENT_LOWER
if c.Get(AMBIENT, i) {
action = pr_CAP_AMBIENT_RAISE
if !c.Get(AMBIENT, i) {
continue
}
err = prctl(pr_CAP_AMBIENT, action, uintptr(i), 0, 0)
err = prctl(pr_CAP_AMBIENT, pr_CAP_AMBIENT_RAISE, uintptr(i), 0, 0)
if err != nil {
// Ignore EINVAL as not supported on kernels before 4.3
if err == syscall.EINVAL { //nolint:errorlint // Errors from syscall are bare.
Expand Down
63 changes: 63 additions & 0 deletions capability/capability_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ const (
maxLastCap = CAP_CHECKPOINT_RESTORE
)

func requirePCapSet(t *testing.T) {
pid, err := NewPid(0)
if err != nil {
t.Fatal(err)
}
if !pid.Get(EFFECTIVE, CAP_SETPCAP) {
t.Skip("The test needs `CAP_SETPCAP`.")
}
}

func TestLastCap(t *testing.T) {
last, err := LastCap()
switch runtime.GOOS {
Expand Down Expand Up @@ -68,3 +78,56 @@ func TestListSupported(t *testing.T) {
t.Fatalf("result is too short (got %d, want %d): +%v", len(list), minLen, list)
}
}

func TestAmbientCapSet(t *testing.T) {
if runtime.GOOS != "linux" {
return
}
requirePCapSet(t)

capBounding := []Cap{CAP_KILL, CAP_CHOWN, CAP_SYSLOG}
capPermitted := []Cap{CAP_KILL, CAP_CHOWN}
capEffective := []Cap{CAP_KILL}
capInheritable := []Cap{CAP_KILL, CAP_CHOWN}
capAmbient := []Cap{CAP_KILL, CAP_CHOWN}

pid, err := newPid(0)
if err != nil {
t.Fatal(err)
}
pid.Set(BOUNDING, capBounding...)
pid.Set(PERMITTED, capPermitted...)
pid.Set(EFFECTIVE, capEffective...)
pid.Set(INHERITABLE, capInheritable...)
pid.Set(AMBIENT, capAmbient...)
if err = pid.Apply(CAPS | BOUNDING | AMBIENT); err != nil {
t.Fatal(err)
}

// Restore the cap set data from current process
if err = pid.Load(); err != nil {
t.Fatal(err)
}
for _, cap := range capAmbient {
if !pid.Get(AMBIENT, cap) {
t.Fatalf("expected ambient cap(%d) to be set but it's not", cap)
}
}

// Remove a ambient cap, to check `PR_CAP_AMBIENT_CLEAR_ALL` work.
pid.Clear(AMBIENT)
pid.Set(AMBIENT, capAmbient[0])
if err = pid.Apply(CAPS | BOUNDING | AMBIENT); err != nil {
t.Fatal(err)
}

if err = pid.Load(); err != nil {
t.Fatal(err)
}
if !pid.Get(AMBIENT, capAmbient[0]) {
t.Fatalf("expected ambient cap(%d) to be set but it's not", capAmbient[0])
}
if pid.Get(AMBIENT, capAmbient[1]) {
t.Fatalf("expected ambient cap(%d) not to be set but it has been set", capAmbient[1])
}
}
Loading