diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-01-15 13:48:51 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-15 13:48:51 -0800 |
| commit | 2ebd21478e25fd545c34b0e0102a09451bb21ea6 (patch) | |
| tree | 571ca1ca18a951a2f6b13f80ee7a59e85bd9a8ea /pkg/sentry | |
| parent | 275ac8ce1debf89a22eb1150df3bf9ba7a0bc9ba (diff) | |
| parent | fdfa05ff2c99b4a2f7c0b22fc491a268f1f2e164 (diff) | |
Merge pull request #1540 from laijs:fix-PCIDs
PiperOrigin-RevId: 289925133
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/platform/kvm/machine_amd64.go | 4 | ||||
| -rw-r--r-- | pkg/sentry/platform/kvm/machine_arm64.go | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkg/sentry/platform/kvm/machine_amd64.go b/pkg/sentry/platform/kvm/machine_amd64.go index b99fe425e..873e39dc7 100644 --- a/pkg/sentry/platform/kvm/machine_amd64.go +++ b/pkg/sentry/platform/kvm/machine_amd64.go @@ -90,7 +90,9 @@ func (m *machine) dropPageTables(pt *pagetables.PageTables) { // Clear from all PCIDs. for _, c := range m.vCPUs { - c.PCIDs.Drop(pt) + if c.PCIDs != nil { + c.PCIDs.Drop(pt) + } } } diff --git a/pkg/sentry/platform/kvm/machine_arm64.go b/pkg/sentry/platform/kvm/machine_arm64.go index 7ae47f291..3b1f20219 100644 --- a/pkg/sentry/platform/kvm/machine_arm64.go +++ b/pkg/sentry/platform/kvm/machine_arm64.go @@ -97,7 +97,9 @@ func (m *machine) dropPageTables(pt *pagetables.PageTables) { // Clear from all PCIDs. for _, c := range m.vCPUs { - c.PCIDs.Drop(pt) + if c.PCIDs != nil { + c.PCIDs.Drop(pt) + } } } |