From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-186.mta0.migadu.com (out-186.mta0.migadu.com [91.218.175.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 63850BE46 for ; Fri, 6 Dec 2024 00:48:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.186 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733446132; cv=none; b=TfyG5JFqNLfF+LGCvn9ueU0kLd7fQq6AWi/iV6lFs7q+wRWbQ2sRGk/ms+Gg+jFuIPCaK00GIFsI7S7BSEw60fgCVaprk7CXS4p+1qjFQ16xfcDwyRPmAmHYZyx3PMCsRa97uuKYc5bsElg1Be7dilhCYcKtabcNPwwTlvUk8uM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733446132; c=relaxed/simple; bh=hZeKIXTC/sOG7mA+goS1z5dbXjoOqDOqBTWnMUk3+rE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=SyaAEvDPsQ0j+DHJiVvKyp+mmXxBDJ2O6cuWgu5FxxrEB2Kg84JhwmW9Qt2/Ce+yPIXdpRrqlXk6C1wjE9EOfXf55a90//acmsS9+TWClcBJ5vjO/zYFZiMfg21daW25opLK7eUll/gQn8dJqWQE2v13hqBw150IO9KCtUNaqJY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=wH1AkYap; arc=none smtp.client-ip=91.218.175.186 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="wH1AkYap" Date: Thu, 5 Dec 2024 16:48:44 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1733446128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=zTomUZzUQRbQ0kv/WGXZgGfaSH9n4l1h8NH8fWxrXro=; b=wH1AkYapMaRe0IEsoSywqxDxOq4c5cQXIiK+9wcEKlyVO0Mpdrp8ztKe/UpF0bo/VQFogS 5CTLvWqWPJgn4vAPiC3uDqq9ORIydWPQb29BKXPUOOUSZatwZ14ChVQnHIoNBVFWYcDMDi 8p9hmIhVHumzu7nkkweIPGV9VAnoUv4= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Oliver Upton To: Jing Zhang Cc: stable@vger.kernel.org, Marc Zyngier , Kunkun Jiang Subject: Re: [PATCH 5.15.y 1/3] KVM: arm64: vgic-its: Add a data length check in vgic_its_save_* Message-ID: References: <20241204202340.2717420-1-jingzhangos@google.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241204202340.2717420-1-jingzhangos@google.com> X-Migadu-Flow: FLOW_OUT On Wed, Dec 04, 2024 at 12:23:38PM -0800, Jing Zhang wrote: > commit 7fe28d7e68f92cc3d0668b8f2fbdf5c303ac3022 upstream. > > In all the vgic_its_save_*() functinos, they do not check whether > the data length is 8 bytes before calling vgic_write_guest_lock. > This patch adds the check. To prevent the kernel from being blown up > when the fault occurs, KVM_BUG_ON() is used. And the other BUG_ON()s > are replaced together. > > Cc: stable@vger.kernel.org > Signed-off-by: Kunkun Jiang > [Jing: Update with the new entry read/write helpers] > Signed-off-by: Jing Zhang > Link: https://lore.kernel.org/r/20241107214137.428439-4-jingzhangos@google.com > Signed-off-by: Oliver Upton For the series: Acked-by: Oliver Upton -- Thanks, Oliver > --- > arch/arm64/kvm/vgic/vgic-its.c | 20 ++++++++------------ > arch/arm64/kvm/vgic/vgic.h | 24 ++++++++++++++++++++++++ > 2 files changed, 32 insertions(+), 12 deletions(-) > > diff --git a/arch/arm64/kvm/vgic/vgic-its.c b/arch/arm64/kvm/vgic/vgic-its.c > index 02ab6ab6ba91..bff7c49dfda5 100644 > --- a/arch/arm64/kvm/vgic/vgic-its.c > +++ b/arch/arm64/kvm/vgic/vgic-its.c > @@ -2135,7 +2135,6 @@ static int scan_its_table(struct vgic_its *its, gpa_t base, int size, u32 esz, > static int vgic_its_save_ite(struct vgic_its *its, struct its_device *dev, > struct its_ite *ite, gpa_t gpa, int ite_esz) > { > - struct kvm *kvm = its->dev->kvm; > u32 next_offset; > u64 val; > > @@ -2144,7 +2143,8 @@ static int vgic_its_save_ite(struct vgic_its *its, struct its_device *dev, > ((u64)ite->irq->intid << KVM_ITS_ITE_PINTID_SHIFT) | > ite->collection->collection_id; > val = cpu_to_le64(val); > - return kvm_write_guest_lock(kvm, gpa, &val, ite_esz); > + > + return vgic_its_write_entry_lock(its, gpa, val, ite_esz); > } > > /** > @@ -2280,7 +2280,6 @@ static int vgic_its_restore_itt(struct vgic_its *its, struct its_device *dev) > static int vgic_its_save_dte(struct vgic_its *its, struct its_device *dev, > gpa_t ptr, int dte_esz) > { > - struct kvm *kvm = its->dev->kvm; > u64 val, itt_addr_field; > u32 next_offset; > > @@ -2291,7 +2290,8 @@ static int vgic_its_save_dte(struct vgic_its *its, struct its_device *dev, > (itt_addr_field << KVM_ITS_DTE_ITTADDR_SHIFT) | > (dev->num_eventid_bits - 1)); > val = cpu_to_le64(val); > - return kvm_write_guest_lock(kvm, ptr, &val, dte_esz); > + > + return vgic_its_write_entry_lock(its, ptr, val, dte_esz); > } > > /** > @@ -2471,7 +2471,8 @@ static int vgic_its_save_cte(struct vgic_its *its, > ((u64)collection->target_addr << KVM_ITS_CTE_RDBASE_SHIFT) | > collection->collection_id); > val = cpu_to_le64(val); > - return kvm_write_guest_lock(its->dev->kvm, gpa, &val, esz); > + > + return vgic_its_write_entry_lock(its, gpa, val, esz); > } > > static int vgic_its_restore_cte(struct vgic_its *its, gpa_t gpa, int esz) > @@ -2482,8 +2483,7 @@ static int vgic_its_restore_cte(struct vgic_its *its, gpa_t gpa, int esz) > u64 val; > int ret; > > - BUG_ON(esz > sizeof(val)); > - ret = kvm_read_guest_lock(kvm, gpa, &val, esz); > + ret = vgic_its_read_entry_lock(its, gpa, &val, esz); > if (ret) > return ret; > val = le64_to_cpu(val); > @@ -2517,7 +2517,6 @@ static int vgic_its_save_collection_table(struct vgic_its *its) > u64 baser = its->baser_coll_table; > gpa_t gpa = GITS_BASER_ADDR_48_to_52(baser); > struct its_collection *collection; > - u64 val; > size_t max_size, filled = 0; > int ret, cte_esz = abi->cte_esz; > > @@ -2541,10 +2540,7 @@ static int vgic_its_save_collection_table(struct vgic_its *its) > * table is not fully filled, add a last dummy element > * with valid bit unset > */ > - val = 0; > - BUG_ON(cte_esz > sizeof(val)); > - ret = kvm_write_guest_lock(its->dev->kvm, gpa, &val, cte_esz); > - return ret; > + return vgic_its_write_entry_lock(its, gpa, 0, cte_esz); > } > > /** > diff --git a/arch/arm64/kvm/vgic/vgic.h b/arch/arm64/kvm/vgic/vgic.h > index 2be4b0759f5b..d2fc5ecb223e 100644 > --- a/arch/arm64/kvm/vgic/vgic.h > +++ b/arch/arm64/kvm/vgic/vgic.h > @@ -6,6 +6,7 @@ > #define __KVM_ARM_VGIC_NEW_H__ > > #include > +#include > > #define PRODUCT_ID_KVM 0x4b /* ASCII code K */ > #define IMPLEMENTER_ARM 0x43b > @@ -126,6 +127,29 @@ static inline bool vgic_irq_is_multi_sgi(struct vgic_irq *irq) > return vgic_irq_get_lr_count(irq) > 1; > } > > +static inline int vgic_its_read_entry_lock(struct vgic_its *its, gpa_t eaddr, > + u64 *eval, unsigned long esize) > +{ > + struct kvm *kvm = its->dev->kvm; > + > + if (KVM_BUG_ON(esize != sizeof(*eval), kvm)) > + return -EINVAL; > + > + return kvm_read_guest_lock(kvm, eaddr, eval, esize); > + > +} > + > +static inline int vgic_its_write_entry_lock(struct vgic_its *its, gpa_t eaddr, > + u64 eval, unsigned long esize) > +{ > + struct kvm *kvm = its->dev->kvm; > + > + if (KVM_BUG_ON(esize != sizeof(eval), kvm)) > + return -EINVAL; > + > + return kvm_write_guest_lock(kvm, eaddr, &eval, esize); > +} > + > /* > * This struct provides an intermediate representation of the fields contained > * in the GICH_VMCR and ICH_VMCR registers, such that code exporting the GIC > > base-commit: 0a51d2d4527b43c5e467ffa6897deefeaf499358 > -- > 2.47.0.338.g60cca15819-goog >