Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp3283361ybc; Mon, 25 Nov 2019 11:55:03 -0800 (PST) X-Google-Smtp-Source: APXvYqzDIkpvwUvpWDKHOGTpLn44xmatFJsuPT54UuOX2BTvu7BMfKvx8GNwys/xvnTK/CtM8MTv X-Received: by 2002:a17:906:1c07:: with SMTP id k7mr24429934ejg.229.1574711703751; Mon, 25 Nov 2019 11:55:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574711703; cv=none; d=google.com; s=arc-20160816; b=XDhcc+Gq7S4FkI+dUJr7in7oEeRCU1bSuM2tnE39EwO5ZZvCA10B+JGR+ro1Jj7pVy qwy6J6x0oEcD43VfLb1y7GMxGMCjwF2qEtEbTfCrG9YBT2wwK1dgGp9P3unHckzMorf8 fbf7JwomIblyUHtYg76HC908Quu4Ukx71oZ+WTAkFg9ckvlRnrSSITx5EGO529cD3PgZ OXDS1mBZQAs26jW5AmYrH1c4w9ldstnGuENmOy0hlJbnTUkC+DD34hNyI5PKn3dy2PJ+ PvMmQEazLpRqceQAiNo6hw6PXNtcpwP1IbYZqfIbQo7Tql6bKo7WOSIfszr/AR8TUMk5 LN+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=vXMmnNGKg3tJmhKWEmPdoHChgPHviIbMLnoiK6ldKks=; b=TaW5AKQWVLgLOBZt+txXbhMeXO++rsvh8zYBULMJhcsNeRvMd61h5dhSIZhD6Eg2/H vzI761sWH5Hn/kup6TmPq04389EzlP8i2uBn01wr9xxnxiuChxeUQJd4hbgumlhoj3J5 /ME1lx5lqXxoIg948miU5Jf5hUhdISOjLc2y/AGE4ODA64/X6A/1N4CsDuUtd8Yewh8O UD329fkKRolSyMDMZOVzs1OIxelzm0szTdzuYnkA75Eh3WFeXnR6tMbP3dkw7GWytJoS pNvoRLZ0RU/kO949u495kMnf2i0hA2TGlIvD0OiT0Me4k8rAS9iVZ8vzrDC5Ff4OUFr8 42zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=QAAwkktQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c10si5904431edv.360.2019.11.25.11.54.38; Mon, 25 Nov 2019 11:55:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=QAAwkktQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726980AbfKYTxR (ORCPT + 99 others); Mon, 25 Nov 2019 14:53:17 -0500 Received: from mail-io1-f68.google.com ([209.85.166.68]:44884 "EHLO mail-io1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725946AbfKYTxQ (ORCPT ); Mon, 25 Nov 2019 14:53:16 -0500 Received: by mail-io1-f68.google.com with SMTP id j20so17608632ioo.11; Mon, 25 Nov 2019 11:53:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vXMmnNGKg3tJmhKWEmPdoHChgPHviIbMLnoiK6ldKks=; b=QAAwkktQYdWygF1R1Q3uQWunWjPhpxYZhDa8YRgeG70ns8iW2AVpnR2iGxFSPzbitl UINQ5tH+0nI+qA0UE0ciK2ysXrQ32EokusD7QZ9a+OmlcAFjMyqETZut4vAC15PusUbG Q83UBbBCJVRKQatLjTq1+wfevur4OE7oRSo6dyvUhGy9TBFwX6lSPypi6IImJUSWUBiS 32umWRVKK/yasZBqrprx3gwueLUl3bTpeknlNfrmV9ctDVPjyElK17sMVFHPAtBvWKaG GyR/qQcdCl7duAhpFcJY4035RoUBN3QERsWK/go6etbJCPUL0SGQkatXl6OJ6UGs5XyN Vw3A== 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:in-reply-to :references; bh=vXMmnNGKg3tJmhKWEmPdoHChgPHviIbMLnoiK6ldKks=; b=mufJorw4f6fDu8aG/XbL9t1yifQ8pHFw1ZXLB5l4Z7WE2DmBmoUY248MDaAJkvW8kB 7wZ3/bzZK1J9mUEC3/ODgjs+gtT4pKzEPdQ/8Ua/y7aa6SjQeAUMNzztDCIOCb1xFF0n INTUflCAOBhLNJ4T6sh41ozRrCukAaPmitgPelXkTHZ0Mk/qth4wAcq3pK3UBPrZjK7w eNWpe19V42aX0nTs+OjVguNw81LQWKHzNJwrV5PK6tRWdYa0RncXwCXnDeMZFYvgDAPB E8/BctklUwJUmO/EkMifa/Zhn7CMJub9hflhKKuMFoUnwkMBLniObitr+g0dkay72Lhv 5Row== X-Gm-Message-State: APjAAAWJO51m8IAC7nwaieQtYvm0y0/uz7twtzFY/GAu/RfNuB4OeI8f EWHgXh2Yyw5iOccUGjG8Acg= X-Received: by 2002:a02:55c3:: with SMTP id e186mr29522881jab.143.1574711595706; Mon, 25 Nov 2019 11:53:15 -0800 (PST) Received: from cs-dulles.cs.umn.edu (cs-dulles.cs.umn.edu. [128.101.35.54]) by smtp.googlemail.com with ESMTPSA id t4sm2456592ilh.29.2019.11.25.11.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2019 11:53:14 -0800 (PST) From: Navid Emamdoost To: natechancellor@gmail.com, Bjorn Helgaas , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Cc: emamd001@umn.edu, Navid Emamdoost Subject: [PATCH v2] PCI/IOV: Fix memory leak in pci_iov_add_virtfn() Date: Mon, 25 Nov 2019 13:52:52 -0600 Message-Id: <20191125195255.23740-1-navid.emamdoost@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191125180448.GA39139@ubuntu-x2-xlarge-x86> References: <20191125180448.GA39139@ubuntu-x2-xlarge-x86> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In the implementation of pci_iov_add_virtfn() the allocated virtfn is leaked if pci_setup_device() fails. The error handling is not calling pci_stop_and_remove_bus_device(). Change the goto label to failed2. Fixes: 156c55325d30 ("PCI: Check for pci_setup_device() failure in pci_iov_add_virtfn()") Signed-off-by: Navid Emamdoost --- Changes in v2: - rename the labels for error paths --- drivers/pci/iov.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index b3f972e8cfed..deec9f9e0b61 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -187,10 +187,10 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id) sprintf(buf, "virtfn%u", id); rc = sysfs_create_link(&dev->dev.kobj, &virtfn->dev.kobj, buf); if (rc) - goto failed2; + goto failed1; rc = sysfs_create_link(&virtfn->dev.kobj, &dev->dev.kobj, "physfn"); if (rc) - goto failed3; + goto failed2; kobject_uevent(&virtfn->dev.kobj, KOBJ_CHANGE); @@ -198,11 +198,10 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id) return 0; -failed3: - sysfs_remove_link(&dev->dev.kobj, buf); failed2: - pci_stop_and_remove_bus_device(virtfn); + sysfs_remove_link(&dev->dev.kobj, buf); failed1: + pci_stop_and_remove_bus_device(virtfn); pci_dev_put(dev); failed0: virtfn_remove_bus(dev->bus, bus); -- 2.17.1