diff options
| author | Lai Jiangshan <eag0628@gmail.com> | 2020-01-09 09:01:17 +0000 |
|---|---|---|
| committer | Lai Jiangshan <laijs@linux.alibaba.com> | 2020-01-09 09:18:33 +0000 |
| commit | fdfa05ff2c99b4a2f7c0b22fc491a268f1f2e164 (patch) | |
| tree | 2da9bcc86daf407994f903c9406375a6eb731fb4 | |
| parent | d057871f410088fe6825b1dde695f015e36abf73 (diff) | |
Avoid panic when c.PCIDs is nil
When PCID is disabled, there would throw a panic
when dropPageTables() access to c.PCID without check.
Signed-off-by: Lai Jiangshan <eag0628@gmail.com>
| -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) + } } } |