Skip to contentSkip to conversation

KVM: fix memory leak in kvm_io_bus_unregister_dev()

PATCH Superseded Rustam Kovhaev 2 participants 3 messages Aug 30, 2020 – Sep 1, 2020 KVM

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 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

---
 virt/kvm/kvm_main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
virt/kvm/kvm_main.c +6 -1
index 67cd0b88a6b6..646aa7b82548 100644
@@ -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);
@@ -4351,6 +4351,11 @@ void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx,
 			  GFP_KERNEL_ACCOUNT);
 	if (!new_bus)  {
 		pr_err("kvm: failed to shrink bus, removing it completely\n");
+		for (j = 0; j < bus->dev_count; j++) {
+			if (j == i)
+				continue;
+			kvm_iodevice_destructor(bus->range[j].dev);
+		}
 		goto broken;
 	}
 
Signature · 1 line
2.28.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 25 lines · Rustam Kovhaev

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

---
 virt/kvm/kvm_main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
virt/kvm/kvm_main.c +1 -1
index 67cd0b88a6b6..646aa7b82548 100644
@@ -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 4352

Quoted 2 lines
virt/kvm/kvm_main.c +0 -0
@@ -4351,6 +4351,11 @@ void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx,
 			  GFP_KERNEL_ACCOUNT);
 	if (!new_bus)  {

^^^ redundant space

virt/kvm/kvm_main.c void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, · line 4359

Quoted 7 lines
virt/kvm/kvm_main.c +5 -0
 		pr_err("kvm: failed to shrink bus, removing it completely\n");
+		for (j = 0; j < bus->dev_count; j++) {
+			if (j == i)
+				continue;
+			kvm_iodevice_destructor(bus->range[j].dev);
+		}
 		goto broken;

The name of the label is really misleading (as it is not actually a failure path), I'd even suggest we get rid of this goto completely, something like

	new_bus = kmalloc(struct_size(bus, range, bus->dev_count - 1),
			  GFP_KERNEL_ACCOUNT);
	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");
		for (j = 0; j < bus->dev_count; j++) {
			if (j == i)
				continue;
			kvm_iodevice_destructor(bus->range[j].dev);
	}

	rcu_assign_pointer(kvm->buses[bus_idx], new_bus);
	synchronize_srcu_expedited(&kvm->srcu);
	kfree(bus);
	return;

virt/kvm/kvm_main.c void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, · line 4360

Quoted 1 line
virt/kvm/kvm_main.c +0 -0
 	}

None of the above should block the fix IMO, so:

Signature · 1 line
Vitaly
#2 lore raw
Quoted 64 lines · Vitaly Kuznetsov
Quoted 25 lines · Rustam Kovhaev

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

---
 virt/kvm/kvm_main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
virt/kvm/kvm_main.c +1 -1
index 67cd0b88a6b6..646aa7b82548 100644
@@ -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 4352

Quoted 2 lines
virt/kvm/kvm_main.c +0 -0
@@ -4351,6 +4351,11 @@ void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx,
 			  GFP_KERNEL_ACCOUNT);
 	if (!new_bus)  {

^^^ redundant space

virt/kvm/kvm_main.c void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, · line 4359

Quoted 7 lines
virt/kvm/kvm_main.c +5 -0
 		pr_err("kvm: failed to shrink bus, removing it completely\n");
+		for (j = 0; j < bus->dev_count; j++) {
+			if (j == i)
+				continue;
+			kvm_iodevice_destructor(bus->range[j].dev);
+		}
 		goto broken;

The name of the label is really misleading (as it is not actually a failure path), I'd even suggest we get rid of this goto completely, something like

	new_bus = kmalloc(struct_size(bus, range, bus->dev_count - 1),
			  GFP_KERNEL_ACCOUNT);
	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");
		for (j = 0; j < bus->dev_count; j++) {
			if (j == i)
				continue;
			kvm_iodevice_destructor(bus->range[j].dev);
	}

	rcu_assign_pointer(kvm->buses[bus_idx], new_bus);
	synchronize_srcu_expedited(&kvm->srcu);
	kfree(bus);
	return;
Quoted 9 lines

virt/kvm/kvm_main.c void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, · line 4360

Quoted 1 line
virt/kvm/kvm_main.c +0 -0
 	}

None of the above should block the fix IMO, so:

Signature · 1 line
Vitaly

hi Vitaly, thank you for the review! i'll send the new patch