diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-02-25 09:53:55 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-02-25 09:53:55 +0100 |
| commit | 0fb00d326ffc36844fac0bfefd8644585a86d4a6 (patch) | |
| tree | 7fa63f85f0b8485081e3f26c2a808ccc6949885c /arch/arm | |
| parent | 17e4bce0ae63c7e03f3c7fa8d80890e7af3d4971 (diff) | |
| parent | fd451b90e78c4178bcfc5072f2b2b637500c109a (diff) | |
Merge tag 'kvm-arm-for-4.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/ARM fixes for 4.5-rc6
- Fix per-vcpu vgic bitmap allocation
- Do not give copy random memory on MMIO read
- Fix GICv3 APR register restore order
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kvm/mmio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c index 7f33b2056ae6..0f6600f05137 100644 --- a/arch/arm/kvm/mmio.c +++ b/arch/arm/kvm/mmio.c @@ -206,7 +206,8 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run, run->mmio.is_write = is_write; run->mmio.phys_addr = fault_ipa; run->mmio.len = len; - memcpy(run->mmio.data, data_buf, len); + if (is_write) + memcpy(run->mmio.data, data_buf, len); if (!ret) { /* We handled the access successfully in the kernel. */ |