diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-01-15 22:01:09 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-15 22:01:09 +0000 |
| commit | 72508bbf0555f72724b9267bbf21e188f2ea6fa3 (patch) | |
| tree | 7d3ea9905090463c339be9ee4cf699c2fdf318c2 /pkg | |
| parent | 0f82a58822a207d9fb067f55e41bb0e278b5c8ef (diff) | |
| parent | 2ebd21478e25fd545c34b0e0102a09451bb21ea6 (diff) | |
Merge release-20191213.0-121-g2ebd214 (automated)
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/sentry/platform/kvm/machine_amd64.go | 4 | ||||
| -rwxr-xr-x | 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 100755 --- 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) + } } } |