From: Qiushi Wu <[email protected]>

kobject_init_and_add() takes reference even when it fails.
If this function returns an error, kobject_put() must be called to
properly clean up the memory associated with the object. Thus,
when call of kobject_init_and_add() fail, we should call kobject_put()
instead of kfree(). Previous commit "b8eb718348b8" fixed a similar problem.

Fixes: 5fe6cc60680d ("PCI: prevent duplicate slot names")
Signed-off-by: Qiushi Wu <[email protected]>
---
 drivers/pci/slot.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
index cc386ef2fa12..3861505741e6 100644
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -268,13 +268,16 @@ struct pci_slot *pci_create_slot(struct pci_bus *parent, 
int slot_nr,
        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 @@ struct pci_slot *pci_create_slot(struct pci_bus *parent, 
int slot_nr,
        mutex_unlock(&pci_slot_mutex);
        return slot;
 err:
-       kfree(slot);
        slot = ERR_PTR(err);
        goto out;
 }
-- 
2.17.1

Reply via email to