diff options
| author | Christoffer Dall <christoffer.dall@linaro.org> | 2016-12-05 10:32:11 +0100 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2016-12-09 15:47:00 +0000 |
| commit | 8e1a0476f8563cadfa32e9b4fff39c4224553b1e (patch) | |
| tree | 88f62776b6415c351a6243d6d6fc639df7f99589 /virt/kvm | |
| parent | 266068eabb1077adf7d74a66de6610e7a6205d02 (diff) | |
| download | blackbird-op-linux-8e1a0476f8563cadfa32e9b4fff39c4224553b1e.tar.gz blackbird-op-linux-8e1a0476f8563cadfa32e9b4fff39c4224553b1e.zip | |
KVM: arm/arm64: timer: Check for properly initialized timer on init
When the arch timer code fails to initialize (for example because the
memory mapped timer doesn't work, which is currently seen with the AEM
model), then KVM just continues happily with a final result that KVM
eventually does a NULL pointer dereference of the uninitialized cycle
counter.
Check directly for this in the init path and give the user a reasonable
error in this case.
Cc: Shih-Wei Li <shihwei@cs.columbia.edu>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'virt/kvm')
| -rw-r--r-- | virt/kvm/arm/arch_timer.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 17b8fa52bf3b..ae95fc0e3214 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -425,6 +425,11 @@ int kvm_timer_hyp_init(void) info = arch_timer_get_kvm_info(); timecounter = &info->timecounter; + if (!timecounter->cc) { + kvm_err("kvm_arch_timer: uninitialized timecounter\n"); + return -ENODEV; + } + if (info->virtual_irq <= 0) { kvm_err("kvm_arch_timer: invalid virtual timer IRQ: %d\n", info->virtual_irq); |
