From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 70CC5C433E0 for ; Thu, 18 Jun 2020 02:41:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4160621927 for ; Thu, 18 Jun 2020 02:41:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592448063; bh=iWIUER23wzCOCeRHFFTexOPF6uNXNU87K8YRWhn08C4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YmGgq4xfy/8RaeZMcS+jTjLm8Wkw07xoK1yVxFkbLcyGxSSSeRY+xWC9D2UzOHVpT gCQsxEUwAIsdG3IZTuKUGwzSSNS+7zPclFBJF6py6tlL7NanDGGo+aL+zo+xkVBiwK oMKhMI+Gp81oe+44U/OyoxWWB2dJH0Z8o95rO2yk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728282AbgFRBMf (ORCPT ); Wed, 17 Jun 2020 21:12:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:41236 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728937AbgFRBMd (ORCPT ); Wed, 17 Jun 2020 21:12:33 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5FAF821924; Thu, 18 Jun 2020 01:12:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442753; bh=iWIUER23wzCOCeRHFFTexOPF6uNXNU87K8YRWhn08C4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YxGi3Ef4agkir3pbcHRf73S3WusAoLb3uYlQ/ORNnCHTdBfE5jdNk8zcBBZvnSj4z jjr4AT9d730tH1XIMZljeNS2ULAbtQSsHaxe7xPxbB14H9f0jg2aSDuLqG/kS5Vhii 6Ra5+Mpw20LrG3hnqsZqEvNHWjPkgf8RBncZ9plk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Rob Herring , Bjorn Helgaas , Lorenzo Pieralisi , Arnd Bergmann , Sasha Levin , linux-pci@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 204/388] PCI: Fix pci_register_host_bridge() device_register() error handling Date: Wed, 17 Jun 2020 21:05:01 -0400 Message-Id: <20200618010805.600873-204-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Rob Herring [ Upstream commit 1b54ae8327a4d630111c8d88ba7906483ec6010b ] If device_register() has an error, we should bail out of pci_register_host_bridge() rather than continuing on. Fixes: 37d6a0a6f470 ("PCI: Add pci_register_host_bridge() interface") Link: https://lore.kernel.org/r/20200513223859.11295-1-robh@kernel.org Signed-off-by: Rob Herring Signed-off-by: Bjorn Helgaas Reviewed-by: Lorenzo Pieralisi Reviewed-by: Arnd Bergmann Signed-off-by: Sasha Levin --- drivers/pci/probe.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 77b8a145c39b..e21dc71b1907 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -909,9 +909,10 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) goto free; err = device_register(&bridge->dev); - if (err) + if (err) { put_device(&bridge->dev); - + goto free; + } bus->bridge = get_device(&bridge->dev); device_enable_async_suspend(bus->bridge); pci_set_bus_of_node(bus); -- 2.25.1