summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo A. R. Silva <gustavo@embeddedor.com>2019-05-31 14:24:53 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2019-06-05 14:14:48 +0200
commitb3ffd74a2f6fbec131eff6d81bc7a6dbbac57bc7 (patch)
treea1b4c463bb73b56fbbecc7d74fc1dfea4a86fdd7
parent5a253552a5108bcabc2eb4e5b2b86262232f17e7 (diff)
downloadlinux-b3ffd74a2f6fbec131eff6d81bc7a6dbbac57bc7.tar.gz
linux-b3ffd74a2f6fbec131eff6d81bc7a6dbbac57bc7.tar.bz2
linux-b3ffd74a2f6fbec131eff6d81bc7a6dbbac57bc7.zip
KVM: irqchip: Use struct_size() in kzalloc()
One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example: struct foo { int stuff; struct boo entry[]; }; instance = kzalloc(sizeof(struct foo) + count * sizeof(struct boo), GFP_KERNEL); Instead of leaving these open-coded and prone to type mistakes, we can now use the new struct_size() helper: instance = kzalloc(struct_size(instance, entry, count), GFP_KERNEL); This code was detected with the help of Coccinelle. Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--virt/kvm/irqchip.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c
index 79e59e4fa3dc..f8be6a3d1aa6 100644
--- a/virt/kvm/irqchip.c
+++ b/virt/kvm/irqchip.c
@@ -196,9 +196,7 @@ int kvm_set_irq_routing(struct kvm *kvm,
nr_rt_entries += 1;
- new = kzalloc(sizeof(*new) + (nr_rt_entries * sizeof(struct hlist_head)),
- GFP_KERNEL_ACCOUNT);
-
+ new = kzalloc(struct_size(new, map, nr_rt_entries), GFP_KERNEL_ACCOUNT);
if (!new)
return -ENOMEM;