diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-06-01 03:07:45 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-06-01 03:07:45 +0000 |
| commit | eda688cd9ce01a5105aa6ca1470852b132ffa7a0 (patch) | |
| tree | 14f2cb88414d64aa023eb7471a7ad3a39cac6c88 | |
| parent | 2153eaa4427637d2215cf8f64de827727d86d578 (diff) | |
| parent | 4f374699818fec39dccdfcb07752fd0f728fe53d (diff) | |
Merge release-20210518.0-63-g4f3746998 (automated)
| -rw-r--r-- | pkg/sentry/kernel/auth/credentials.go | 2 | ||||
| -rw-r--r-- | runsc/specutils/specutils.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/auth/credentials.go b/pkg/sentry/kernel/auth/credentials.go index 6862f2ef5..3325fedcb 100644 --- a/pkg/sentry/kernel/auth/credentials.go +++ b/pkg/sentry/kernel/auth/credentials.go @@ -125,7 +125,7 @@ func NewUserCredentials(kuid KUID, kgid KGID, extraKGIDs []KGID, capabilities *T creds.EffectiveCaps = capabilities.EffectiveCaps creds.BoundingCaps = capabilities.BoundingCaps creds.InheritableCaps = capabilities.InheritableCaps - // TODO(nlacasse): Support ambient capabilities. + // TODO(gvisor.dev/issue/3166): Support ambient capabilities. } else { // If no capabilities are specified, grant capabilities consistent with // setresuid + setresgid from NewRootCredentials to the given uid and diff --git a/runsc/specutils/specutils.go b/runsc/specutils/specutils.go index 11b476690..c228d6299 100644 --- a/runsc/specutils/specutils.go +++ b/runsc/specutils/specutils.go @@ -246,7 +246,7 @@ func Capabilities(enableRaw bool, specCaps *specs.LinuxCapabilities) (*auth.Task if caps.PermittedCaps, err = capsFromNames(specCaps.Permitted, skipSet); err != nil { return nil, err } - // TODO(nlacasse): Support ambient capabilities. + // TODO(gvisor.dev/issue/3166): Support ambient capabilities. } return &caps, nil } |