From: Kunkun Jiang <jiangkunkun@huawei.com>
To: Marc Zyngier <maz@kernel.org>,
Oliver Upton <oliver.upton@linux.dev>,
James Morse <james.morse@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Zenghui Yu <yuzenghui@huawei.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Randy Dunlap <rdunlap@infradead.org>,
Eric Auger <eauger@redhat.com>
Cc: <linux-arm-kernel@lists.infradead.org>, <kvmarm@lists.linux.dev>,
<wanghaibin.wang@huawei.com>,
Kunkun Jiang <jiangkunkun@huawei.com>, <lishusen2@huawei.com>
Subject: [PATCH 1/3] KVM: arm64: vgic-its: Add a data length check in vgic_its_save_*
Date: Thu, 20 Jun 2024 21:06:48 +0800 [thread overview]
Message-ID: <20240620130650.1279-2-jiangkunkun@huawei.com> (raw)
In-Reply-To: <20240620130650.1279-1-jiangkunkun@huawei.com>
In all the vgic_its_save_*() functinos, it does not check
whether the data length is larger than 8 bytes before
calling vgic_write_guest_lock. This patch add the check.
Link: https://lore.kernel.org/kvmarm/86v82ckimh.wl-maz@kernel.org/
Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.com>
---
arch/arm64/kvm/vgic/vgic-its.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm64/kvm/vgic/vgic-its.c b/arch/arm64/kvm/vgic/vgic-its.c
index 40bb43f20bf3..060605fba3b6 100644
--- a/arch/arm64/kvm/vgic/vgic-its.c
+++ b/arch/arm64/kvm/vgic/vgic-its.c
@@ -2094,6 +2094,7 @@ 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);
+ BUG_ON(ite_esz > sizeof(val));
return vgic_write_guest_lock(kvm, gpa, &val, ite_esz);
}
@@ -2246,6 +2247,7 @@ 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);
+ BUG_ON(dte_esz > sizeof(dte_esz));
return vgic_write_guest_lock(kvm, ptr, &val, dte_esz);
}
@@ -2433,6 +2435,7 @@ 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);
+ BUG_ON(esz > sizeof(val));
return vgic_write_guest_lock(its->dev->kvm, gpa, &val, esz);
}
--
2.33.0
next prev parent reply other threads:[~2024-06-20 13:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 13:06 [PATCH 0/3] KVM: arm64: vgic-its: Some fixes about vgic-its Kunkun Jiang
2024-06-20 13:06 ` Kunkun Jiang [this message]
2024-06-20 22:25 ` [PATCH 1/3] KVM: arm64: vgic-its: Add a data length check in vgic_its_save_* Oliver Upton
2024-06-21 1:43 ` Kunkun Jiang
2024-06-21 6:39 ` Oliver Upton
2024-06-20 13:06 ` [PATCH 2/3] KVM: arm64: vgic-its: Clear dte when mapd unmaps a device Kunkun Jiang
2024-06-20 13:06 ` [PATCH 3/3] KVM: arm64: vgic-its: Clear ite when discard frees an ite Kunkun Jiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240620130650.1279-2-jiangkunkun@huawei.com \
--to=jiangkunkun@huawei.com \
--cc=catalin.marinas@arm.com \
--cc=eauger@redhat.com \
--cc=james.morse@arm.com \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=lishusen2@huawei.com \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=rdunlap@infradead.org \
--cc=suzuki.poulose@arm.com \
--cc=wanghaibin.wang@huawei.com \
--cc=will@kernel.org \
--cc=yuzenghui@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox