summaryrefslogtreecommitdiff
authorMarc Zyngier <marc.zyngier@arm.com>2017-11-16 17:58:15 (GMT)
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-14 08:28:14 (GMT)
commit42c3f4c55f10102b3e522ae99754a9a0ea41235d (patch)
tree462fecce456f92037363560039a842346a8a02a5
parentcf6668d57a26e7d72d12117e9aba0c3c1578bfc5 (diff)
downloadcommon-42c3f4c55f10102b3e522ae99754a9a0ea41235d.zip
common-42c3f4c55f10102b3e522ae99754a9a0ea41235d.tar.gz
common-42c3f4c55f10102b3e522ae99754a9a0ea41235d.tar.bz2
KVM: arm/arm64: vgic-irqfd: Fix MSI entry allocation
commit 150009e2c70cc3c6e97f00e7595055765d32fb85 upstream. Using the size of the structure we're allocating is a good idea and avoids any surprise... In this case, we're happilly confusing kvm_kernel_irq_routing_entry and kvm_irq_routing_entry... Fixes: 95b110ab9a09 ("KVM: arm/arm64: Enable irqchip routing") Reported-by: AKASHI Takahiro <takahiro.akashi@linaro.org> Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat
-rw-r--r--virt/kvm/arm/vgic/vgic-irqfd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/virt/kvm/arm/vgic/vgic-irqfd.c b/virt/kvm/arm/vgic/vgic-irqfd.c
index f138ed2..a26c677 100644
--- a/virt/kvm/arm/vgic/vgic-irqfd.c
+++ b/virt/kvm/arm/vgic/vgic-irqfd.c
@@ -112,8 +112,7 @@ int kvm_vgic_setup_default_irq_routing(struct kvm *kvm)
u32 nr = dist->nr_spis;
int i, ret;
- entries = kcalloc(nr, sizeof(struct kvm_kernel_irq_routing_entry),
- GFP_KERNEL);
+ entries = kcalloc(nr, sizeof(*entries), GFP_KERNEL);
if (!entries)
return -ENOMEM;