diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-06-01 20:05:01 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-06-01 20:05:01 +0000 |
| commit | 8c219cd837148991bfcf44358a0ff858db69d3d9 (patch) | |
| tree | 3f0fade7886a55ae799b32fc26966919c2222781 /pkg/sentry/platform | |
| parent | 6bb9c6dbed00cdd1eeb8b4b874fbc152f793f1ce (diff) | |
| parent | 288a1ca6f09cc6213713d00dca0d18600d2e857c (diff) | |
Merge release-20200522.0-50-g288a1ca6 (automated)
Diffstat (limited to 'pkg/sentry/platform')
| -rw-r--r-- | pkg/sentry/platform/kvm/machine_arm64.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkg/sentry/platform/kvm/machine_arm64.go b/pkg/sentry/platform/kvm/machine_arm64.go index e42505542..750751aa3 100644 --- a/pkg/sentry/platform/kvm/machine_arm64.go +++ b/pkg/sentry/platform/kvm/machine_arm64.go @@ -60,6 +60,12 @@ func rdonlyRegionsForSetMem() (phyRegions []physicalRegion) { if !vr.accessType.Write && vr.accessType.Read { rdonlyRegions = append(rdonlyRegions, vr.region) } + + // TODO(gvisor.dev/issue/2686): PROT_NONE should be specially treated. + // Workaround: treated as rdonly temporarily. + if !vr.accessType.Write && !vr.accessType.Read && !vr.accessType.Execute { + rdonlyRegions = append(rdonlyRegions, vr.region) + } }) for _, r := range rdonlyRegions { |