diff options
| author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-05-07 14:47:50 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-06-10 14:56:27 +0200 |
| commit | 83de5204d38767e26524ad04e76fdc94ddd61bca (patch) | |
| tree | 9b39ca74ac5ae7150bcf2ea064e105d5ba86aeaa | |
| parent | c7ca19969e7a75c3c2b08b1349b2f7ae9a90a6b0 (diff) | |
MIPS: KVM: Do not sign extend on unsigned MMIO load
commit ed9244e6c534612d2b5ae47feab2f55a0d4b4ced upstream.
Fix possible unintended sign extension in unsigned MMIO loads by casting
to uint16_t in the case of mmio_needed != 2.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Tested-by: James Hogan <james.hogan@imgtec.com>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/9985/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | arch/mips/kvm/kvm_mips_emul.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kvm/kvm_mips_emul.c b/arch/mips/kvm/kvm_mips_emul.c index e75ef8219caf..c76f297b7149 100644 --- a/arch/mips/kvm/kvm_mips_emul.c +++ b/arch/mips/kvm/kvm_mips_emul.c @@ -1626,7 +1626,7 @@ kvm_mips_complete_mmio_load(struct kvm_vcpu *vcpu, struct kvm_run *run) if (vcpu->mmio_needed == 2) *gpr = *(int16_t *) run->mmio.data; else - *gpr = *(int16_t *) run->mmio.data; + *gpr = *(uint16_t *)run->mmio.data; break; case 1: |