From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFB40243964; Tue, 29 Apr 2025 18:03:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745949799; cv=none; b=YnyNDasp1kTvhdZWNO0OeTIWL7LxylJlNkQOtcgtYAKmA6+f/geWPXZH4LmiR2NYnu+TWQ6zmeZDnsrPVaMTmywzJIj+QGrgXUCrzTslyYwtzhGUfIxakZ0b8oC9AJ8QHIhG3q/OMLs9cj8rzsEW/KKmY5AQZDGvVgPLNcnbssk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745949799; c=relaxed/simple; bh=RV+OKbyaDu+r0Cg5dLJgzqzRxRbFMDrPuuKZK5BBzWg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DOmQGTljcI+h9344/QVxbuw6MaTe8VKbh0utqBgaD6iPF7Nh13bPixxxDKsqx3G30q/NSxJtJepxXZxcvHMewslaGsIjp02MMQDP3rG0ngyeblAOvYhkRjJT38pQERMYmCKF5mKJ5ACruaWS9v9vDM6U3nc8wjRraziIqlVLbAc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HGgY3lSy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="HGgY3lSy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1EB47C4CEE3; Tue, 29 Apr 2025 18:03:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745949799; bh=RV+OKbyaDu+r0Cg5dLJgzqzRxRbFMDrPuuKZK5BBzWg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HGgY3lSyIp9UApdMfVAOJkpga1z1Tf5T4uWYi/65B1DgcuihDEMnTaL2mi+nJugYh n8gG9MOq2SqaE8/1LIUGMcQHXfi8MDUj/1NWtBZPkaB6eUgTSjK4VRUcANEy8Pr3Td C8bQ6Pmcr2IzNZv45cOMNVeEpDkE/fW8KHjpAKV0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ma Ke , Bjorn Helgaas , Sasha Levin Subject: [PATCH 6.1 031/167] PCI: Fix reference leak in pci_register_host_bridge() Date: Tue, 29 Apr 2025 18:42:19 +0200 Message-ID: <20250429161053.011468365@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161051.743239894@linuxfoundation.org> References: <20250429161051.743239894@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ma Ke [ Upstream commit 804443c1f27883926de94c849d91f5b7d7d696e9 ] If device_register() fails, call put_device() to give up the reference to avoid a memory leak, per the comment at device_register(). Found by code review. Link: https://lore.kernel.org/r/20250225021440.3130264-1-make24@iscas.ac.cn Fixes: 37d6a0a6f470 ("PCI: Add pci_register_host_bridge() interface") Signed-off-by: Ma Ke [bhelgaas: squash Dan Carpenter's double free fix from https://lore.kernel.org/r/db806a6c-a91b-4e5a-a84b-6b7e01bdac85@stanley.mountain] Signed-off-by: Bjorn Helgaas Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin --- drivers/pci/probe.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index b818cb7d4f8ac..03f7550d89827 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -888,6 +888,7 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) resource_size_t offset, next_offset; LIST_HEAD(resources); struct resource *res, *next_res; + bool bus_registered = false; char addr[64], *fmt; const char *name; int err; @@ -951,6 +952,7 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) name = dev_name(&bus->dev); err = device_register(&bus->dev); + bus_registered = true; if (err) goto unregister; @@ -1034,12 +1036,15 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) unregister: put_device(&bridge->dev); device_del(&bridge->dev); - free: #ifdef CONFIG_PCI_DOMAINS_GENERIC pci_bus_release_domain_nr(bus, parent); #endif - kfree(bus); + if (bus_registered) + put_device(&bus->dev); + else + kfree(bus); + return err; } -- 2.39.5