From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964944AbdIYNfI (ORCPT ); Mon, 25 Sep 2017 09:35:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43904 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964892AbdIYNfG (ORCPT ); Mon, 25 Sep 2017 09:35:06 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B710713AAE Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=eric.auger@redhat.com From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, marc.zyngier@arm.com, cdall@linaro.org, peter.maydell@linaro.org, andre.przywara@arm.com, wanghaibin.wang@huawei.com Cc: wu.wubin@huawei.com Subject: [PATCH 5/9] KVM: arm/arm64: vgic-its: Check GITS_CBASER validity before processing commands Date: Mon, 25 Sep 2017 15:34:34 +0200 Message-Id: <1506346478-1631-6-git-send-email-eric.auger@redhat.com> In-Reply-To: <1506346478-1631-1-git-send-email-eric.auger@redhat.com> References: <1506346478-1631-1-git-send-email-eric.auger@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 25 Sep 2017 13:35:06 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At the moment vgic_its_process_commands() does not check the CBASER is valid before processing any command. Let's fix that. Also rename cbaser local variable into cbaser_pa to avoid any confusion with the full register. Signed-off-by: Eric Auger --- virt/kvm/arm/vgic/vgic-its.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index 60ecf91..720552c 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -1301,17 +1301,20 @@ static void vgic_mmio_write_its_cbaser(struct kvm *kvm, struct vgic_its *its, /* Must be called with the cmd_lock held. */ static void vgic_its_process_commands(struct kvm *kvm, struct vgic_its *its) { - gpa_t cbaser; + gpa_t cbaser_pa; u64 cmd_buf[4]; - /* Commands are only processed when the ITS is enabled. */ - if (!its->enabled) + /* + * Commands are only processed when the ITS is enabled and + * CBASER is valid + */ + if (!its->enabled || (!(its->cbaser & GITS_CBASER_VALID))) return; - cbaser = CBASER_ADDRESS(its->cbaser); + cbaser_pa = CBASER_ADDRESS(its->cbaser); while (its->cwriter != its->creadr) { - int ret = kvm_read_guest(kvm, cbaser + its->creadr, + int ret = kvm_read_guest(kvm, cbaser_pa + its->creadr, cmd_buf, ITS_CMD_SIZE); /* * If kvm_read_guest() fails, this could be due to the guest -- 2.5.5