KVM: fix memory leak in kvm_io_bus_unregister_dev()
PATCH v2 1/1 KVM: fix memory leak in kvm_io_bus_unregister_dev()
when kmalloc() fails in kvm_io_bus_unregister_dev(), before removing the bus, we should iterate over all other devices linked to it and call kvm_iodevice_destructor() for them
---
v2:
- remove redundant whitespace
- remove goto statement and use if/else
--- virt/kvm/kvm_main.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
virt/kvm/kvm_main.c +12 -9
@@ -4332,7 +4332,7 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,void kvm_io_bus_unregister_dev (struct kvm *kvm,enum kvm_bus bus_idx,struct kvm_io_device *dev) { -int i; +int i, j;struct kvm_io_bus *new_bus, *bus; bus =kvm_get_bus (kvm, bus_idx);
@@ -4349,17 +4349,20 @@ 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 ),GFP_KERNEL_ACCOUNT ); -if (!new_bus) { +if (new_bus) { +memcpy (new_bus, bus,sizeof (*bus) + i *sizeof (struct kvm_io_range )); + new_bus->dev_count--; +memcpy (new_bus->range + i, bus->range + i +1 , + (new_bus->dev_count - i) *sizeof (struct kvm_io_range )); + }else {pr_err ("kvm: failed to shrink bus, removing it completely\n" ); - goto broken; +for (j =0 ; j < bus->dev_count; j++) { +if (j == i) +continue ; +kvm_iodevice_destructor (bus->range[j].dev); + } } -memcpy (new_bus, bus,sizeof (*bus) + i *sizeof (struct kvm_io_range )); - new_bus->dev_count--; -memcpy (new_bus->range + i, bus->range + i +1 , - (new_bus->dev_count - i) *sizeof (struct kvm_io_range )); - -broken:rcu_assign_pointer (kvm->buses[bus_idx], new_bus);synchronize_srcu_expedited (&kvm->srcu);kfree (bus);
Signature · 1 line
2.28.0
Hi,
Quoted 8 lines · Rustam Kovhaev
when
kmalloc()fails inkvm_io_bus_unregister_dev(), before removing the bus, we should iterate over all other devices linked to it and callkvm_iodevice_destructor()for themReported-and-tested-by [email protected]Signed-off-by Rustam Kovhaev <[email protected]>Reviewed-by Vitaly Kuznetsov <[email protected]>
I think it's worthwhile to add a Fixes tag for this, too.
Please, see more comments below...
Quoted 22 lines
---
v2:
- remove redundant whitespace
- remove goto statement and use if/else--- virt/kvm/kvm_main.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)virt/kvm/kvm_main.c +1
-1@@ -4332,7 +4332,7 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,void kvm_io_bus_unregister_dev (struct kvm *kvm,enum kvm_bus bus_idx,struct kvm_io_device *dev) { -int i; +int i, j;struct kvm_io_bus *new_bus, *bus; bus =kvm_get_bus (kvm, bus_idx);
virt/kvm/kvm_main.c void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, · line 4353
Quoted 6 lines
virt/kvm/kvm_main.c +2
-1@@ -4349,17 +4349,20 @@ 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 ),GFP_KERNEL_ACCOUNT ); -if (!new_bus) { +if (new_bus) { +memcpy (new_bus, bus,sizeof (*bus) + i *sizeof (struct kvm_io_range ));
^^^
It seems that you can use struct_size() here (see the allocation code above)...
virt/kvm/kvm_main.c void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, · line 4356
Quoted 3 lines
virt/kvm/kvm_main.c +3
-0+ new_bus->dev_count--; +memcpy (new_bus->range + i, bus->range + i +1 , + (new_bus->dev_count - i) *sizeof (struct kvm_io_range ));
^^^
...and, if possible, you can also use flex_array_size() here.
Thanks
--
Gustavo
Quoted 20 lines
virt/kvm/kvm_main.c +6
-7+ }else {pr_err ("kvm: failed to shrink bus, removing it completely\n" ); - goto broken; +for (j =0 ; j < bus->dev_count; j++) { +if (j == i) +continue ; +kvm_iodevice_destructor (bus->range[j].dev); + } } -memcpy (new_bus, bus,sizeof (*bus) + i *sizeof (struct kvm_io_range )); - new_bus->dev_count--; -memcpy (new_bus->range + i, bus->range + i +1 , - (new_bus->dev_count - i) *sizeof (struct kvm_io_range )); - -broken:rcu_assign_pointer (kvm->buses[bus_idx], new_bus);synchronize_srcu_expedited (&kvm->srcu);kfree (bus);
Quoted 69 lines · Gustavo A. R. Silva
Hi,
Quoted 8 lines · Rustam Kovhaev
when
kmalloc()fails inkvm_io_bus_unregister_dev(), before removing the bus, we should iterate over all other devices linked to it and callkvm_iodevice_destructor()for themReported-and-tested-by [email protected]Signed-off-by Rustam Kovhaev <[email protected]>Reviewed-by Vitaly Kuznetsov <[email protected]>I think it's worthwhile to add a Fixes tag for this, too.
Please, see more comments below...
Quoted 22 lines
---
v2:
- remove redundant whitespace
- remove goto statement and use if/else--- virt/kvm/kvm_main.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)virt/kvm/kvm_main.c +1
-1@@ -4332,7 +4332,7 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,void kvm_io_bus_unregister_dev (struct kvm *kvm,enum kvm_bus bus_idx,struct kvm_io_device *dev) { -int i; +int i, j;struct kvm_io_bus *new_bus, *bus; bus =kvm_get_bus (kvm, bus_idx);virt/kvm/kvm_main.c void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, · line 4353
Quoted 6 lines
virt/kvm/kvm_main.c +2
-1@@ -4349,17 +4349,20 @@ 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 ),GFP_KERNEL_ACCOUNT ); -if (!new_bus) { +if (new_bus) { +memcpy (new_bus, bus,sizeof (*bus) + i *sizeof (struct kvm_io_range ));^^^It seems that you can use
struct_size()here (see the allocation code above)...virt/kvm/kvm_main.c void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, · line 4356
Quoted 3 lines
virt/kvm/kvm_main.c +3
-0+ new_bus->dev_count--; +memcpy (new_bus->range + i, bus->range + i +1 , + (new_bus->dev_count - i) *sizeof (struct kvm_io_range ));^^^...and, if possible, you can also use
flex_array_size()here.Thanks
--
GustavoQuoted 10 lines
virt/kvm/kvm_main.c +6
-1+ }else {pr_err ("kvm: failed to shrink bus, removing it completely\n" ); - goto broken; +for (j =0 ; j < bus->dev_count; j++) { +if (j == i) +continue ; +kvm_iodevice_destructor (bus->range[j].dev); + } }
Quoted 10 lines
virt/kvm/kvm_main.c void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, · line 4368
Quoted 10 lines
virt/kvm/kvm_main.c +0
-6-memcpy (new_bus, bus,sizeof (*bus) + i *sizeof (struct kvm_io_range )); - new_bus->dev_count--; -memcpy (new_bus->range + i, bus->range + i +1 , - (new_bus->dev_count - i) *sizeof (struct kvm_io_range )); - -broken:rcu_assign_pointer (kvm->buses[bus_idx], new_bus);synchronize_srcu_expedited (&kvm->srcu);kfree (bus);
hi Gustavo, thank you for the review, i'll send the new patch. Vitaly, i think i will need to drop your "Reviewed-by", because there is going to be a bit more changes
Quoted 70 lines · Rustam Kovhaev
Quoted 69 lines · Gustavo A. R. Silva
Hi,
Quoted 8 lines · Rustam Kovhaev
when
kmalloc()fails inkvm_io_bus_unregister_dev(), before removing the bus, we should iterate over all other devices linked to it and callkvm_iodevice_destructor()for themReported-and-tested-by [email protected]Signed-off-by Rustam Kovhaev <[email protected]>Reviewed-by Vitaly Kuznetsov <[email protected]>I think it's worthwhile to add a Fixes tag for this, too.
Please, see more comments below...
Quoted 22 lines
---
v2:
- remove redundant whitespace
- remove goto statement and use if/else--- virt/kvm/kvm_main.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)virt/kvm/kvm_main.c +1
-1@@ -4332,7 +4332,7 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,void kvm_io_bus_unregister_dev (struct kvm *kvm,enum kvm_bus bus_idx,struct kvm_io_device *dev) { -int i; +int i, j;struct kvm_io_bus *new_bus, *bus; bus =kvm_get_bus (kvm, bus_idx);virt/kvm/kvm_main.c void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, · line 4353
Quoted 6 lines
virt/kvm/kvm_main.c +2
-1@@ -4349,17 +4349,20 @@ 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 ),GFP_KERNEL_ACCOUNT ); -if (!new_bus) { +if (new_bus) { +memcpy (new_bus, bus,sizeof (*bus) + i *sizeof (struct kvm_io_range ));^^^It seems that you can use
struct_size()here (see the allocation code above)...virt/kvm/kvm_main.c void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, · line 4356
Quoted 3 lines
virt/kvm/kvm_main.c +3
-0+ new_bus->dev_count--; +memcpy (new_bus->range + i, bus->range + i +1 , + (new_bus->dev_count - i) *sizeof (struct kvm_io_range ));^^^...and, if possible, you can also use
flex_array_size()here.Thanks
--
GustavoQuoted 10 lines
virt/kvm/kvm_main.c +6
-1+ }else {pr_err ("kvm: failed to shrink bus, removing it completely\n" ); - goto broken; +for (j =0 ; j < bus->dev_count; j++) { +if (j == i) +continue ; +kvm_iodevice_destructor (bus->range[j].dev); + } }
Quoted 15 lines
Quoted 10 lines
virt/kvm/kvm_main.c void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, · line 4368
Quoted 10 lines
virt/kvm/kvm_main.c +0
-6-memcpy (new_bus, bus,sizeof (*bus) + i *sizeof (struct kvm_io_range )); - new_bus->dev_count--; -memcpy (new_bus->range + i, bus->range + i +1 , - (new_bus->dev_count - i) *sizeof (struct kvm_io_range )); - -broken:rcu_assign_pointer (kvm->buses[bus_idx], new_bus);synchronize_srcu_expedited (&kvm->srcu);kfree (bus);hi Gustavo, thank you for the review, i'll send the new patch. Vitaly, i think i will need to drop your "Reviewed-by", because there is going to be a bit more changes
Personally, I'd prefer to make struct_size()/flex_array_size() a separate preparatory patch so the real fix is small but I don't have a strong opinion. I'll take look at v3 so feel free to drop R-b if you decide to make a combined patch and feel free to keep it if you make the preparatory changes separate :-)
Signature · 1 line
Vitaly
Quoted 18 lines · Vitaly Kuznetsov
Quoted 16 lines · Rustam Kovhaev
Quoted 15 lines · Gustavo A. R. Silva
Hi,
Quoted 8 lines · Rustam Kovhaev
when
kmalloc()fails inkvm_io_bus_unregister_dev(), before removing the bus, we should iterate over all other devices linked to it and callkvm_iodevice_destructor()for themReported-and-tested-by [email protected]Signed-off-by Rustam Kovhaev <[email protected]>Reviewed-by Vitaly Kuznetsov <[email protected]>I think it's worthwhile to add a Fixes tag for this, too.
Please, see more comments below...
[..]
Quoted 6 lines
Quoted 5 lines
hi Gustavo, thank you for the review, i'll send the new patch. Vitaly, i think i will need to drop your "Reviewed-by", because there is going to be a bit more changes
Quoted 6 lines
Personally, I'd prefer to make struct_size()/flex_array_size() a separate preparatory patch so the real fix is small but I don't have a strong opinion. I'll take look at v3 so feel free to drop R-b if you decide to make a combined patch and feel free to keep it if you make the preparatory changes separate :-)
I agree. A two-patch series is much better in this case.
Rustam - please add a Fixes tag to the first patch and see if it can be applied to -stable. If so, you should Cc [email protected], too.
Thanks
--
Gustavo