From nobody Wed Oct 8 16:10:09 2025 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BD2F429A9CB; Fri, 27 Jun 2025 09:05:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751015123; cv=none; b=Rokrx3+geMUHF+uuEy7/iqubqaCI1W4k8jxEPE72DmsCabkxwjxZDVB22HI0OYoo7Peuf6BHK28cZxxHHjT7nHel8KMjY7M6DNA9RIvsJX/6qATpWELL6LSMJwXgxuS8Mz2Rykhky1OuTOuJn5VU57EjkaGhL8uGztrZWx3DMrY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751015123; c=relaxed/simple; bh=Yumj2jjL7iMEr2PCocQWVhhCzYR+wpPVl0HIRFGclQY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oS7LTaZB/AMCGtsx7jgDW0MXGJedDuBkcFkbBva8I4zjzkodM8DSwORuRvZYiY0a/dvlVaH3773l9s2OA6K6qW3PYMX2H22SCfAwAcgTQFrFH2yvYOsGdIG++HNoeHQS7fMVn0cGmLM/OuCeYGVZwmyAsBxW4x78cT8flipA6s0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8Ax3eLJXl5oUDIeAQ--.28658S3; Fri, 27 Jun 2025 17:05:13 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowJCxM+TEXl5ovCsAAA--.1247S6; Fri, 27 Jun 2025 17:05:13 +0800 (CST) From: Bibo Mao To: Tianrui Zhao , Huacai Chen , Xianglai Li Cc: kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v4 4/6] LoongArch: KVM: Check validation of num_cpu from user space Date: Fri, 27 Jun 2025 17:05:05 +0800 Message-Id: <20250627090507.808319-5-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20250627090507.808319-1-maobibo@loongson.cn> References: <20250627090507.808319-1-maobibo@loongson.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowJCxM+TEXl5ovCsAAA--.1247S6 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Content-Type: text/plain; charset="utf-8" The maximum supported cpu number is EIOINTC_ROUTE_MAX_VCPUS about irqchip eiointc, here add validation about cpu number to avoid array pointer overflow. Cc: stable@vger.kernel.org Fixes: 1ad7efa552fd ("LoongArch: KVM: Add EIOINTC user mode read and write = functions") Signed-off-by: Bibo Mao --- arch/loongarch/kvm/intc/eiointc.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/arch/loongarch/kvm/intc/eiointc.c b/arch/loongarch/kvm/intc/ei= ointc.c index b48511f903b5..169fe1de2c92 100644 --- a/arch/loongarch/kvm/intc/eiointc.c +++ b/arch/loongarch/kvm/intc/eiointc.c @@ -798,7 +798,7 @@ static int kvm_eiointc_ctrl_access(struct kvm_device *d= ev, int ret =3D 0; unsigned long flags; unsigned long type =3D (unsigned long)attr->attr; - u32 i, start_irq; + u32 i, start_irq, val; void __user *data; struct loongarch_eiointc *s =3D dev->kvm->arch.eiointc; =20 @@ -806,8 +806,14 @@ static int kvm_eiointc_ctrl_access(struct kvm_device *= dev, spin_lock_irqsave(&s->lock, flags); switch (type) { case KVM_DEV_LOONGARCH_EXTIOI_CTRL_INIT_NUM_CPU: - if (copy_from_user(&s->num_cpu, data, 4)) + if (copy_from_user(&val, data, 4)) ret =3D -EFAULT; + else { + if (val < EIOINTC_ROUTE_MAX_VCPUS) + s->num_cpu =3D val; + else + ret =3D -EINVAL; + } break; case KVM_DEV_LOONGARCH_EXTIOI_CTRL_INIT_FEATURE: if (copy_from_user(&s->features, data, 4)) @@ -835,7 +841,7 @@ static int kvm_eiointc_regs_access(struct kvm_device *d= ev, struct kvm_device_attr *attr, bool is_write) { - int addr, cpuid, offset, ret =3D 0; + int addr, cpu, offset, ret =3D 0; unsigned long flags; void *p =3D NULL; void __user *data; @@ -843,7 +849,7 @@ static int kvm_eiointc_regs_access(struct kvm_device *d= ev, =20 s =3D dev->kvm->arch.eiointc; addr =3D attr->attr; - cpuid =3D addr >> 16; + cpu =3D addr >> 16; addr &=3D 0xffff; data =3D (void __user *)attr->addr; switch (addr) { @@ -868,8 +874,11 @@ static int kvm_eiointc_regs_access(struct kvm_device *= dev, p =3D &s->isr.reg_u32[offset]; break; case EIOINTC_COREISR_START ... EIOINTC_COREISR_END: + if (cpu >=3D s->num_cpu) + return -EINVAL; + offset =3D (addr - EIOINTC_COREISR_START) / 4; - p =3D &s->coreisr.reg_u32[cpuid][offset]; + p =3D &s->coreisr.reg_u32[cpu][offset]; break; case EIOINTC_COREMAP_START ... EIOINTC_COREMAP_END: offset =3D (addr - EIOINTC_COREMAP_START) / 4; --=20 2.39.3