diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-06-21 18:05:11 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-06-21 18:05:11 +0000 |
| commit | bbb135e87199a4ef766246273c6ee6554f779d6b (patch) | |
| tree | 011ca32149c260b91f0ae9ea7eebbb51cf13089f /pkg/sentry/kernel | |
| parent | eac2377720a7defbdbec2180825335d2a5cb3fc9 (diff) | |
| parent | 054b5632ef9f2ce72b4aaa32f68ecb83b1c41834 (diff) | |
Merge 054b5632 (automated)
Diffstat (limited to 'pkg/sentry/kernel')
| -rw-r--r-- | pkg/sentry/kernel/auth/capability_set.go | 2 | ||||
| -rwxr-xr-x | pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/auth/capability_set.go b/pkg/sentry/kernel/auth/capability_set.go index a21fa6f0f..fc8c6745c 100644 --- a/pkg/sentry/kernel/auth/capability_set.go +++ b/pkg/sentry/kernel/auth/capability_set.go @@ -24,7 +24,7 @@ import ( type CapabilitySet uint64 // AllCapabilities is a CapabilitySet containing all valid capabilities. -var AllCapabilities = CapabilitySetOf(linux.MaxCapability+1) - 1 +var AllCapabilities = CapabilitySetOf(linux.CAP_LAST_CAP+1) - 1 // CapabilitySetOf returns a CapabilitySet containing only the given // capability. diff --git a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go index be6b07629..895abb129 100755 --- a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go +++ b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go @@ -1,11 +1,12 @@ package kernel import ( + "unsafe" + "fmt" "gvisor.dev/gvisor/third_party/gvsync" "reflect" "strings" - "unsafe" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race |