Commit 8a94644b authored May 27, 2020 by Qiushi Wu Committed by Bjorn Helgaas Jul 10, 2020

PCI: Fix pci_create_slot() reference count leak

kobject_init_and_add() takes a reference even when it fails.  If it returns
an error, kobject_put() must be called to clean up the memory associated
with the object.

When kobject_init_and_add() fails, call kobject_put() instead of kfree().

b8eb7183 ("net-sysfs: Fix reference count leak in
rx|netdev_queue_add_kobject") fixed a similar problem.

Link: https://lore.kernel.org/r/20200528021322.1984-1-wu000273@umn.edu


Signed-off-by: Qiushi Wu <wu000273@umn.edu>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

parent b3a9e3b9

drivers/pci/slot.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -268,13 +268,16 @@ placeholder:
		slot_name = make_slot_name(name);
		if (!slot_name) {
		err = -ENOMEM;
		kfree(slot);
		goto err;
		}

		err = kobject_init_and_add(&slot->kobj, &pci_slot_ktype, NULL,
		"%s", slot_name);
		if (err)
		if (err) {
		kobject_put(&slot->kobj);
		goto err;
		}

		INIT_LIST_HEAD(&slot->list);
		list_add(&slot->list, &parent->slots);
		@@ -293,7 +296,6 @@ out:
		mutex_unlock(&pci_slot_mutex);
		return slot;
		err:
		kfree(slot);
		slot = ERR_PTR(err);
		goto out;
		}

Admin message