From patchwork Wed Nov 25 07:22:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jubin Zhong X-Patchwork-Id: 11930489 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDD20C5519F for ; Wed, 25 Nov 2020 07:23:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A87D20857 for ; Wed, 25 Nov 2020 07:23:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726714AbgKYHXF (ORCPT ); Wed, 25 Nov 2020 02:23:05 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:7986 "EHLO szxga06-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726463AbgKYHXF (ORCPT ); Wed, 25 Nov 2020 02:23:05 -0500 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4CgsmQ5zgYzhh3f; Wed, 25 Nov 2020 15:22:46 +0800 (CST) Received: from use12-sp2.huawei.com (10.67.189.20) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.487.0; Wed, 25 Nov 2020 15:22:52 +0800 From: Jubin Zhong To: CC: , , Subject: [PATCH] PCI: Fix pci_create_slot() memory leak Date: Wed, 25 Nov 2020 15:22:51 +0800 Message-ID: <1606288971-47927-1-git-send-email-zhongjubin@huawei.com> X-Mailer: git-send-email 1.8.5.6 MIME-Version: 1.0 X-Originating-IP: [10.67.189.20] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org After commit 8a94644b440e ("PCI: Fix pci_create_slot() reference count leak"), kobject_put() is called instead of kfree() if kobject_init_and_add() fails. However, we still need to free the slot memory before overwriting it as ERR_PTR(err). This partially reverts the commit 8a94644b440e. Fixes: 8a94644b440e ("PCI: Fix pci_create_slot() reference count leak") Signed-off-by: Jubin Zhong --- drivers/pci/slot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c index 3861505..a4be62e 100644 --- a/drivers/pci/slot.c +++ b/drivers/pci/slot.c @@ -268,7 +268,6 @@ 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; } @@ -296,6 +295,7 @@ 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; }