From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 F36411AE876 for ; Wed, 4 Dec 2024 23:22:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733354570; cv=none; b=ay1rkqJqyZ8VIXe7AiOEtI/Rzz5f82Fngz+jCe/Xbro+akYZP8EbBm9AdRIX7x6DQjmVZKGmx6DEdJU1tm2iHJ45oNcuPJEnNIRzZyXxmXaLeclOsTGUpevGp+hNcjalgCExc4QlEpAeyEJW86cDNiqJ1TqBDAjsnytfrwsqHtw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733354570; c=relaxed/simple; bh=J5ycda2mZXMPdcE7FWGD/VEk5u0Qaf5xBPPbeoukg8c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bx/cOCq8BsEZklsfI6UFEAroRL5lJaodzgW2LNILrzT3vlS0OAHPhTQqI/jYit26+oyD6Y1SH4eimULRvIv++kT5jdN3m8z8drd6aWIIDKqdzjrtQXYMyiEk4yIaghv8dnETFBPm+pgB+0OwL/mD2vp/s14hfKuDACXtI7Vrvrs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ii7Z30aj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ii7Z30aj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 263D0C4CECD; Wed, 4 Dec 2024 23:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733354569; bh=J5ycda2mZXMPdcE7FWGD/VEk5u0Qaf5xBPPbeoukg8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ii7Z30ajKcdevp2IJKNgkqCEtib7KgPgZPbuquj91Tq+KeEnt7QO71+2/e9wqyr0i E7pG4YhySBw+EI6Gd2cCFNBboQ8QnpHCTjP4UIFOCJcAAVwwS/P4LgLAH4069Pci16 ey/jve1wbmMqQpevxg+0xp5aqIjWZOrJyztWa8sMNfSMLf2078pqijC1cbxMkMDA9w sdSrEdlZcq1pDSP79AHWajXeBClgL/hTkVsbDg6vJqK8DUPQ3ctQuEU90+/OedTc4M mVZbpCjj8Xo6pmeaZft44Qzp3dvJlHKPZbbJ0K7sD1LvCXZe2uUt4ImZ3dXG6J43y3 Wl8D8nNuQ4enw== From: Sasha Levin To: stable@vger.kernel.org Cc: Jing Zhang , Sasha Levin Subject: Re: [PATCH 4.19.y 1/3] KVM: arm64: vgic-its: Add a data length check in vgic_its_save_* Date: Wed, 4 Dec 2024 17:11:30 -0500 Message-ID: <20241204161704-8c258bd87fc66f81@stable.kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241204202038.2714140-1-jingzhangos@google.com> References: Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit [ Sasha's backport helper bot ] Hi, The upstream commit SHA1 provided is correct: 7fe28d7e68f92cc3d0668b8f2fbdf5c303ac3022 Status in newer kernel trees: 6.12.y | Not found 6.11.y | Not found 6.6.y | Not found 6.1.y | Not found 5.15.y | Not found 5.10.y | Not found 5.4.y | Not found 4.19.y | Not found Note: The patch differs from the upstream commit: --- 1: 7fe28d7e68f92 ! 1: 841cc795e0665 KVM: arm64: vgic-its: Add a data length check in vgic_its_save_* @@ Metadata ## Commit message ## KVM: arm64: vgic-its: Add a data length check in vgic_its_save_* + 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 @@ Commit message Link: https://lore.kernel.org/r/20241107214137.428439-4-jingzhangos@google.com Signed-off-by: Oliver Upton - ## arch/arm64/kvm/vgic/vgic-its.c ## -@@ arch/arm64/kvm/vgic/vgic-its.c: static int scan_its_table(struct vgic_its *its, gpa_t base, int size, u32 esz, + ## virt/kvm/arm/vgic/vgic-its.c ## +@@ virt/kvm/arm/vgic/vgic-its.c: 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) { @@ arch/arm64/kvm/vgic/vgic-its.c: static int scan_its_table(struct vgic_its *its, u32 next_offset; u64 val; -@@ arch/arm64/kvm/vgic/vgic-its.c: static int vgic_its_save_ite(struct vgic_its *its, struct its_device *dev, +@@ virt/kvm/arm/vgic/vgic-its.c: 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 vgic_write_guest_lock(kvm, gpa, &val, ite_esz); +- return kvm_write_guest_lock(kvm, gpa, &val, ite_esz); + + return vgic_its_write_entry_lock(its, gpa, val, ite_esz); } /** -@@ arch/arm64/kvm/vgic/vgic-its.c: static int vgic_its_restore_itt(struct vgic_its *its, struct its_device *dev) +@@ virt/kvm/arm/vgic/vgic-its.c: 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) { @@ arch/arm64/kvm/vgic/vgic-its.c: static int vgic_its_restore_itt(struct vgic_its u64 val, itt_addr_field; u32 next_offset; -@@ arch/arm64/kvm/vgic/vgic-its.c: static int vgic_its_save_dte(struct vgic_its *its, struct its_device *dev, +@@ virt/kvm/arm/vgic/vgic-its.c: 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 vgic_write_guest_lock(kvm, ptr, &val, dte_esz); +- return kvm_write_guest_lock(kvm, ptr, &val, dte_esz); + + return vgic_its_write_entry_lock(its, ptr, val, dte_esz); } /** -@@ arch/arm64/kvm/vgic/vgic-its.c: static int vgic_its_save_cte(struct vgic_its *its, +@@ virt/kvm/arm/vgic/vgic-its.c: 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 vgic_write_guest_lock(its->dev->kvm, gpa, &val, esz); +- return kvm_write_guest_lock(its->dev->kvm, gpa, &val, esz); + + return vgic_its_write_entry_lock(its, gpa, val, esz); } - /* -@@ arch/arm64/kvm/vgic/vgic-its.c: static int vgic_its_restore_cte(struct vgic_its *its, gpa_t gpa, int esz) + static int vgic_its_restore_cte(struct vgic_its *its, gpa_t gpa, int esz) +@@ virt/kvm/arm/vgic/vgic-its.c: static int vgic_its_restore_cte(struct vgic_its *its, gpa_t gpa, int esz) u64 val; int ret; @@ arch/arm64/kvm/vgic/vgic-its.c: static int vgic_its_restore_cte(struct vgic_its if (ret) return ret; val = le64_to_cpu(val); -@@ arch/arm64/kvm/vgic/vgic-its.c: static int vgic_its_save_collection_table(struct vgic_its *its) +@@ virt/kvm/arm/vgic/vgic-its.c: 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); + gpa_t gpa = BASER_ADDRESS(baser); struct its_collection *collection; - u64 val; size_t max_size, filled = 0; int ret, cte_esz = abi->cte_esz; -@@ arch/arm64/kvm/vgic/vgic-its.c: static int vgic_its_save_collection_table(struct vgic_its *its) +@@ virt/kvm/arm/vgic/vgic-its.c: 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 = vgic_write_guest_lock(its->dev->kvm, gpa, &val, cte_esz); +- 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); } - /* + /** - ## arch/arm64/kvm/vgic/vgic.h ## -@@ arch/arm64/kvm/vgic/vgic.h: static inline int vgic_write_guest_lock(struct kvm *kvm, gpa_t gpa, - return ret; + ## virt/kvm/arm/vgic/vgic.h ## +@@ + #define __KVM_ARM_VGIC_NEW_H__ + + #include ++#include + + #define PRODUCT_ID_KVM 0x4b /* ASCII code K */ + #define IMPLEMENTER_ARM 0x43b +@@ virt/kvm/arm/vgic/vgic.h: 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, @@ arch/arm64/kvm/vgic/vgic.h: static inline int vgic_write_guest_lock(struct kvm * + if (KVM_BUG_ON(esize != sizeof(eval), kvm)) + return -EINVAL; + -+ return vgic_write_guest_lock(kvm, eaddr, &eval, esize); ++ return kvm_write_guest_lock(kvm, eaddr, &eval, esize); +} + /* --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-4.19.y | Success | Success |