From patchwork Thu May 28 02:13:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wu000273@umn.edu X-Patchwork-Id: 1299346 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=umn.edu Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=umn.edu header.i=@umn.edu header.a=rsa-sha256 header.s=google header.b=WfjCj9PA; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49XWTD5FrPz9sSd for ; Thu, 28 May 2020 12:13:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726393AbgE1CNd (ORCPT ); Wed, 27 May 2020 22:13:33 -0400 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:54392 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725901AbgE1CNd (ORCPT ); Wed, 27 May 2020 22:13:33 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 49XWT81HWDz9vC92 for ; Thu, 28 May 2020 02:13:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id w6pyWXoSFXhD for ; Wed, 27 May 2020 21:13:32 -0500 (CDT) Received: from mail-il1-f200.google.com (mail-il1-f200.google.com [209.85.166.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 49XWT76jsXz9vC8v for ; Wed, 27 May 2020 21:13:31 -0500 (CDT) DMARC-Filter: OpenDMARC Filter v1.3.2 mta-p6.oit.umn.edu 49XWT76jsXz9vC8v DKIM-Filter: OpenDKIM Filter v2.11.0 mta-p6.oit.umn.edu 49XWT76jsXz9vC8v Received: by mail-il1-f200.google.com with SMTP id p11so1655515iln.3 for ; Wed, 27 May 2020 19:13:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=+A1YPokMCKgyjret0UYYQzUqVLYn99l1EAUInCbVEoQ=; b=WfjCj9PAtlXuuLhDKdQnyvqFbqNeBfy1HXfmSE8DB9kEXmc8aiyV8STRsAEanfe7ER zIXDQ2/YCJpIlGPgtva8TsOiHNpribBlXJrWzHLan836r2t0jFYN6EBQjqUuCdDEQALL x4n7xX7lOAujaEnUYH18h+qHElRDE3Ob9xkLwSdY0JeIuhcw8sSD3vz8E++kfCZlRZdp SMlp8XtbGU112kLPVGCw0bakf+OiHmbOxTcHVTqxQWAvrGp6azx7HtTDCT4WwZwkyJZu gneTskObuI1l6Ml/vY0HR2C/oV35nVKzu7wZaMka/xzZHTk9vKqseADdyhSRO9R3qd6G rWkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+A1YPokMCKgyjret0UYYQzUqVLYn99l1EAUInCbVEoQ=; b=Fi448daMcdqKQtNZBaDRvzrMdIBIh43rFDQpvtYhIIetZcPfy3eyAtp9hWxydjw8c3 ptZZZAwsihuY0LK5n2a2+vIPqmPJFn9GcA9l2HJVH5VFNnrXedY8jEmGIMK9QkJeYx83 T1W/d7UUH8GR2dpjYWMw0klUTAAeg86N1KaKxoYQ9ksk1Ln/Pwt6MXjuUB/Y3w6C3znz AvNZmFE8QnzkKXJ4E+azV/ydzMxUqzZfP7I+xPzUl63hEjsagAEp/aEvf8W7ymisocsh my0IPYG1wQTBbC79ypUkENIhLRtORfiTZh45CqZclvemHf/GDKyzQNY/r/eIdTFXdyWI 8wUA== X-Gm-Message-State: AOAM531dFHnIkBGzyatLo6AR+fYrSCEUuZIqEaMDmkh8mm6fV4EY80OG NoVSKuOAaamqlnzzpuW2XVjknznwG/ZRBB6vahGPbF36CzD1GCzMDD1p/XDpkfkacmwhxo5OVB5 +8XChFoYN+CyfOddQ6W1KZYj6 X-Received: by 2002:a02:3e06:: with SMTP id s6mr712718jas.57.1590632011202; Wed, 27 May 2020 19:13:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpledpmRFG225p3UpKzQBSus1wf525XSOOKNI6xG7lhRUn81N/jpiuF4hbYE89ppULJCPG8Q== X-Received: by 2002:a02:3e06:: with SMTP id s6mr712708jas.57.1590632010942; Wed, 27 May 2020 19:13:30 -0700 (PDT) Received: from qiushi.dtc.umn.edu (cs-kh5248-02-umh.cs.umn.edu. [128.101.106.4]) by smtp.gmail.com with ESMTPSA id h5sm2398411ile.35.2020.05.27.19.13.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 19:13:30 -0700 (PDT) From: wu000273@umn.edu To: kjlu@umn.edu Cc: wu000273@umn.edu, Bjorn Helgaas , Kenji Kaneshige , Jesse Barnes , Alex Chiang , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] Fix reference count leak in pci_create_slot Date: Wed, 27 May 2020 21:13:22 -0500 Message-Id: <20200528021322.1984-1-wu000273@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Qiushi Wu 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 --- 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; }