summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/pgalloc
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-03 22:38:02 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-03 22:38:02 +0000
commit16f9c56724b27258aadc46e19c0537fd338811d6 (patch)
treeeed18e96e6c521bbe12ff75a0d8d3ee7206d4b6e /pkg/sentry/pgalloc
parent8370c89805c3cf621b5162c834b843d45f2307fe (diff)
parentfe441dd251ba19e6ba8a8ed6f0fa3c147e03360c (diff)
Merge release-20200622.1-315-gfe441dd25 (automated)
Diffstat (limited to 'pkg/sentry/pgalloc')
-rw-r--r--pkg/sentry/pgalloc/pgalloc.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/pgalloc/pgalloc.go b/pkg/sentry/pgalloc/pgalloc.go
index 3243d7214..46d3be58c 100644
--- a/pkg/sentry/pgalloc/pgalloc.go
+++ b/pkg/sentry/pgalloc/pgalloc.go
@@ -409,7 +409,6 @@ func (f *MemoryFile) Allocate(length uint64, kind usage.MemoryKind) (memmap.File
f.mappingsMu.Unlock()
}
- // Mark selected pages as in use.
if f.opts.ManualZeroing {
if err := f.forEachMappingSlice(fr, func(bs []byte) {
for i := range bs {
@@ -419,6 +418,7 @@ func (f *MemoryFile) Allocate(length uint64, kind usage.MemoryKind) (memmap.File
return memmap.FileRange{}, err
}
}
+ // Mark selected pages as in use.
if !f.usage.Add(fr, usageInfo{
kind: kind,
refs: 1,