Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758593AbbGHO0L (ORCPT ); Wed, 8 Jul 2015 10:26:11 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:27757 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758270AbbGHO0I (ORCPT ); Wed, 8 Jul 2015 10:26:08 -0400 From: James Hogan To: Greg KH CC: Nicholas Mc Guire , Gleb Natapov , Paolo Bonzini , , , , Ralf Baechle , , James Hogan Subject: [PATCH stable <3.17] MIPS: KVM: Do not sign extend on unsigned MMIO load Date: Wed, 8 Jul 2015 15:25:07 +0100 Message-ID: <1436365507-22596-1-git-send-email-james.hogan@imgtec.com> X-Mailer: git-send-email 2.3.6 In-Reply-To: <20150619191409.GA12700@kroah.com> References: <20150619191409.GA12700@kroah.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.154.110] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1798 Lines: 49 From: Nicholas Mc Guire 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 Reviewed-by: James Hogan Tested-by: James Hogan Cc: Gleb Natapov Cc: Paolo Bonzini 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 Cc: # v3.10+ Signed-off-by: James Hogan --- This is a trivial backport (i.e. git cherry-pick, git format-patch) for stable branches before v3.17, due to the commit d7d5b05faf16 ("MIPS: KVM: Rename files to remove the prefix "kvm_" and "kvm_mips_"") which renamed a bunch of files including this one. --- arch/mips/kvm/kvm_mips_emul.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: -- 2.3.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/