diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-09 21:17:17 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-09 21:17:17 +0000 |
| commit | 544dbeba179c4667ca48254ffd3105929c0e8ec8 (patch) | |
| tree | d8f291c55f6024268992e9c7c2ef1bfa1b45ab2d /pkg/sentry/platform/ring0/pagetables | |
| parent | c2efbcaa5bb105e652045ee720e8acec1e2bc50d (diff) | |
| parent | 6df400dfb61e2219b1d88dd2aa6be7fbb59d3ab6 (diff) | |
Merge release-20200928.0-84-g6df400dfb (automated)
Diffstat (limited to 'pkg/sentry/platform/ring0/pagetables')
| -rw-r--r-- | pkg/sentry/platform/ring0/pagetables/pagetables_aarch64.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/platform/ring0/pagetables/pagetables_aarch64.go b/pkg/sentry/platform/ring0/pagetables/pagetables_aarch64.go index 6409d1d91..520161755 100644 --- a/pkg/sentry/platform/ring0/pagetables/pagetables_aarch64.go +++ b/pkg/sentry/platform/ring0/pagetables/pagetables_aarch64.go @@ -78,7 +78,7 @@ const ( const ( executeDisable = xn - optionMask = 0xfff | 0xfff<<48 + optionMask = 0xfff | 0xffff<<48 protDefault = accessed | shared ) @@ -188,7 +188,7 @@ func (p *PTE) Set(addr uintptr, opts MapOpts) { v |= mtNormal } else { v = v &^ user - v |= mtDevicenGnRE // Strong order for the addresses with ring0.KernelStartAddress. + v |= mtNormal } atomic.StoreUintptr((*uintptr)(p), v) } |