From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DC087C531D0 for ; Sat, 25 Jul 2026 17:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:MIME-Version: References:In-Reply-To:Subject:Cc:To:From:Message-ID:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qCTMtTlGf8TX43MgfeK58BQDi0wVFj04WmzNNjZ51iQ=; b=cRewrpVD4wx7FW3x12iFDhiywC Vl/lZrCBPCP1DlFy/b9CH40apefwy/WPvicJiHNDdQz5HxylD94rh/GSJjI640ZwAeqB8sHtC0nci BCJuWMkNXY3DqrTdVRWNuwHbkBZjUlevM93HCJdxYqn+hY/Vqt2+rr3TsOTd0RCI0mQ8W6q/afRN3 dS4Yvqs0Pfehf1wBtoPxcTaAIi0O1ErfSTMc/GLN9FQ1/ykRBmXyixKbpKP7bqE8cm6/LkZ/DPE27 A8o3tJWYOxzIImI2DSALZwrwhMGjQAwR472PLO9xdYF7RpjZJ5J7Pb0NnmL9XetgdrFi0wdlT0Y7J N3WmJRow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wnfu4-00000000ZSF-15Ve; Sat, 25 Jul 2026 17:11:12 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wnfu3-00000000ZS8-0LhZ for linux-arm-kernel@lists.infradead.org; Sat, 25 Jul 2026 17:11:11 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 3300641B5D; Sat, 25 Jul 2026 17:11:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 012C61F000E9; Sat, 25 Jul 2026 17:11:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784999470; bh=qCTMtTlGf8TX43MgfeK58BQDi0wVFj04WmzNNjZ51iQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=naU1+Wy7eleqJSfuA4Rog6PKICrFmxIas+IssKpPIQrkuBQpt2jxrLJDHX8gdGtrJ pjTPQyWk4hkvpVFNd0Z6SPusN596kaIckWxU3tZJFPlVZ0Zlmoc7OnCY1AjyAkZvBY e7nQp0vvNnSqNea9AKdb+LHSjaj0H4/ClWUmHS2gvco/f2EG3KIntTHNyRGKh9CPM6 wd8gkbUigOvA/fYWwxcSaa5YDl6anzNU8bwmo4nyxU/Rm4A2UqeJvwl+JaxfgPYCx7 ZILAzmX+3Bf7rnDb+ufosyuppRygiPxKNGrS7qoEhngKLPbUiXf3/Ja8BuOGMmeHrj qz9+2HGSydH8Q== Received: from sofa.misterjones.org ([185.219.108.64] helo=lobster-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1wnfu0-00000008nz7-0LzH; Sat, 25 Jul 2026 17:11:08 +0000 Date: Sat, 25 Jul 2026 18:12:31 +0100 Message-ID: <87wlujouww.wl-maz@kernel.org> From: Marc Zyngier To: Karl Mehltretter Cc: Oliver Upton , Fuad Tabba , Joey Gouly , Steffen Eiden , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH] KVM: arm64: GICv2: Bound the INTID in vgic_v2_deactivate() In-Reply-To: <20260725154020.37305-1-kmehltretter@gmail.com> References: <20260725154020.37305-1-kmehltretter@gmail.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/30.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kmehltretter@gmail.com, oupton@kernel.org, fuad.tabba@linux.dev, joey.gouly@arm.com, seiden@linux.ibm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, stable@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sat, 25 Jul 2026 16:40:20 +0100, Karl Mehltretter wrote: > > vgic_v2_deactivate() passes the INTID from a trapped GICV_DIR write to > vgic_get_vcpu_irq() without checking it against the number of > implemented interrupts. An out-of-range INTID makes the lookup return > NULL and triggers WARN_ON_ONCE(!irq). > > A guest using EOImode=1 can therefore raise a host warning, or panic a > host with panic_on_warn=1. > > The GICv3 counterpart rejects INTIDs outside the configured SGI, PPI and > SPI range before performing the lookup. Add the same check to the GICv2 > path. > > Fixes: 255de897e7fb ("KVM: arm64: GICv2: Handle deactivation via GICV_DIR traps") > Cc: stable@vger.kernel.org > Assisted-by: Claude:claude-opus-5 > Signed-off-by: Karl Mehltretter > --- > arch/arm64/kvm/vgic/vgic-v2.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/kvm/vgic/vgic-v2.c b/arch/arm64/kvm/vgic/vgic-v2.c > index cafa3cb32bda..42430c0fee07 100644 > --- a/arch/arm64/kvm/vgic/vgic-v2.c > +++ b/arch/arm64/kvm/vgic/vgic-v2.c > @@ -163,8 +163,12 @@ void vgic_v2_deactivate(struct kvm_vcpu *vcpu, u32 val) > cpuid = FIELD_GET(GENMASK_ULL(12, 10), val); > val &= ~GENMASK_ULL(12, 10); > > - /* We only deal with DIR when EOIMode==1 */ > - if (!(cpuif->vgic_vmcr & GICH_VMCR_EOI_MODE_MASK)) > + /* > + * We only deal with DIR when EOIMode==1, and only for SGI, > + * PPI or SPI. > + */ > + if (!(cpuif->vgic_vmcr & GICH_VMCR_EOI_MODE_MASK) || > + val >= vcpu->kvm->arch.vgic.nr_spis + VGIC_NR_PRIVATE_IRQS) > return; This duplicates the existing check, as GICv2 has no LPIs. I'd rather drop the WARN_ON() altogether. Thanks, M. -- Jazz isn't dead. It just smells funny.