Skip to content

Commit

Permalink
Merge pull request #10116 from AkihiroSuda/cherrypick-10111-1.7
Browse files Browse the repository at this point in the history
[release/1.7] apparmor: add `signal (receive) peer=/usr/local/bin/rootlesskit,`
  • Loading branch information
dmcgowan committed Apr 23, 2024
2 parents d8acdaf + af19e74 commit e412ca7
Showing 1 changed file with 17 additions and 0 deletions.
17 changes: 17 additions & 0 deletions contrib/apparmor/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import (
"path"
"strings"
"text/template"

"github.com/containerd/log"
)

// NOTE: This code is copied from <github.com/docker/docker/profiles/apparmor>.
Expand Down Expand Up @@ -57,6 +59,10 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) {
signal (receive) peer={{.DaemonProfile}},
# Container processes may send signals amongst themselves.
signal (send,receive) peer={{.Name}},
{{if .RootlessKit}}
# https://github.com/containerd/nerdctl/issues/2730
signal (receive) peer={{.RootlessKit}},
{{end}}
deny @{PROC}/* w, # deny write for all files directly in /proc (not in a subdir)
# deny write to files not in /proc/<number>/** or /proc/sys/**
Expand Down Expand Up @@ -90,6 +96,7 @@ type data struct {
Imports []string
InnerImports []string
DaemonProfile string
RootlessKit string
}

func cleanProfileName(profile string) string {
Expand Down Expand Up @@ -125,6 +132,16 @@ func loadData(name string) (*data, error) {
}
p.DaemonProfile = cleanProfileName(string(currentProfile))

// If we were running in Rootless mode, we could read `/proc/$(cat ${ROOTLESSKIT_STATE_DIR}/child_pid)/exe`,
// but `nerdctl apparmor load` has to be executed as the root.
// So, do not check ${ROOTLESSKIT_STATE_DIR} (nor EUID) here.
p.RootlessKit, err = exec.LookPath("rootlesskit")
if err != nil {
log.L.WithError(err).Debug("apparmor: failed to determine the RootlessKit binary path")
p.RootlessKit = ""
}
log.L.Debugf("apparmor: RootlessKit=%q", p.RootlessKit)

return &p, nil
}

Expand Down

0 comments on commit e412ca7

Please sign in to comment.