AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

KVM: use struct_size() and flex_array_size() helpers in kvm_io_bus_unregister_dev()

Browse Source 
Make use of the struct_size() helper to avoid any potential type
mistakes and protect against potential integer overflows
Make use of the flex_array_size() helper to calculate the size of a
flexible array member within an enclosing structure

Suggested-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Rustam Kovhaev <rkovhaev@gmail.com>
Message-Id: <20200918120500.954436-1-rkovhaev@gmail.com>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Rustam Kovhaev 2020-09-18 05:05:00 -07:00 committed by Paolo Bonzini
parent 4407a797e9
commit 871c433bae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
virt/kvm/kvm_main.c
View File

@ -4350,10 +4350,10 @@ void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx,
new_bus = kmalloc(struct_size(bus, range, bus->dev_count - 1), new_bus = kmalloc(struct_size(bus, range, bus->dev_count - 1),
GFP_KERNEL_ACCOUNT); GFP_KERNEL_ACCOUNT);
if (new_bus) { if (new_bus) {
memcpy(new_bus, bus, sizeof(*bus) + i * sizeof(struct kvm_io_range)); memcpy(new_bus, bus, struct_size(bus, range, i));
new_bus->dev_count--; new_bus->dev_count--;
memcpy(new_bus->range + i, bus->range + i + 1, memcpy(new_bus->range + i, bus->range + i + 1,
(new_bus->dev_count - i) * sizeof(struct kvm_io_range)); flex_array_size(new_bus, range, new_bus->dev_count - i));
} else { } else {
pr_err("kvm: failed to shrink bus, removing it completely\n"); pr_err("kvm: failed to shrink bus, removing it completely\n");
for (j = 0; j < bus->dev_count; j++) { for (j = 0; j < bus->dev_count; j++) {