From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 08 Jul 2015 16:26:13 +0200 (CEST) Received: from mailapp01.imgtec.com ([195.59.15.196]:16113 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27010430AbbGHO0MFd2mn (ORCPT ); Wed, 8 Jul 2015 16:26:12 +0200 Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id 4C8A6AE3832F8; Wed, 8 Jul 2015 15:26:03 +0100 (IST) Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.195.1; Wed, 8 Jul 2015 15:26:06 +0100 Received: from jhogan-linux.le.imgtec.org (192.168.154.110) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.210.2; Wed, 8 Jul 2015 15:26:05 +0100 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] Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 48122 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: james.hogan@imgtec.com Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailapp01.imgtec.com ([195.59.15.196]:16113 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27010430AbbGHO0MFd2mn (ORCPT ); Wed, 8 Jul 2015 16:26:12 +0200 From: 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> In-Reply-To: <20150619191409.GA12700@kroah.com> References: <20150619191409.GA12700@kroah.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-subscribe: List-owner: List-post: List-archive: To: Greg KH Cc: Nicholas Mc Guire , Gleb Natapov , Paolo Bonzini , kvm@vger.kernel.org, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, Ralf Baechle , stable@vger.kernel.org, James Hogan Message-ID: <20150708142507.UlMgjiqjYczP9CE5tUw0p2JQRQsQ-B-Cb8I5dAjZhak@z> 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