From patchwork Tue Jun 23 19:56:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 191564 Delivered-To: patch@linaro.org Received: by 2002:a92:1f07:0:0:0:0:0 with SMTP id i7csp2316127ile; Tue, 23 Jun 2020 13:38:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaR8HK1/mqMzPyYGyGlnU21Ub67DhaE9qrkjZZhogu8fAbmU0UuXjEHHqCWIyriY161TDB X-Received: by 2002:a17:906:da19:: with SMTP id fi25mr578367ejb.369.1592944684612; Tue, 23 Jun 2020 13:38:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592944684; cv=none; d=google.com; s=arc-20160816; b=AhJh6eVlrBlLYDN8oAvdNdOduBhYvG1zwxofQfN/BwATGcHr+8Mizbu+mSrMMBMjzx dgH+zO9S/IrvpoqZMM8Mw8wkX8mSMSvxn4FRrsgQa48j44qals4I5nv3rcoH/iAYoH7w KBbLflTivdlyc4SROZdqlLwssEOfIOq4FGES1JpaBnAidZk7TORRsJH8X1Q4AiELIY+F FT9r9j6zM6f4h5oiqnzXJ8VP9Rzvuayt+RU6xvjB1Fv3BDoSy1vpAale8oBpWAM7vQiO ySPbaDpT7iaYB6f/TIy9XhuRUWsYNw5sVHiaTqBaivH6QbhIbmOHdh6VjR4ATJNltJRL 9t/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QrJHpiaOVHedXaTuKo0bh0mTea3pPyGt5NvcqCLSDBg=; b=z4xQ8jybp2BQWTbQIQAQylnf1HMmofBC1kPXwDDRNCz+kGVy2Fb2nqWryQLKf4d75l sCWFuEhoRMR3FLdydcgItyJeIN9QcfUA4tiDxzjLG76wf3HnWj6DIee7917gvYqbRxqV VYU5LsZm6NtWiCcVVRk4SzsXU3mkoPCxBCYM0vNAqeWVGqljjeuXYOVf2SfAI7ggM2W/ LwFtdegcU7CoiJR0jksUI8Ek7RVbt7p4GhKV4gwUjD0iOMviykgBG367OMEen+8YUXt3 9QrID1rco2wCGzEiOO212XB9hyXTye8paJOSkZx6U0Vxk6u+gLfo5ombyw2ieoUIbxNg NAqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=acYGGrPT; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dr11si14494927ejc.254.2020.06.23.13.38.04; Tue, 23 Jun 2020 13:38:04 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=acYGGrPT; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391900AbgFWUh7 (ORCPT + 15 others); Tue, 23 Jun 2020 16:37:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:33292 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391881AbgFWUh6 (ORCPT ); Tue, 23 Jun 2020 16:37:58 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 08AA121556; Tue, 23 Jun 2020 20:37:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944678; bh=TW+fwH5eDjkKr/FeicQZHbilUnViwTBcA5+u9OldS88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=acYGGrPTffimu0VgidBqHJXoAe/LRJrSYjPui+Xj/ZFEGuiWTzzELGC0rIs19ruHG 2N0U9EfW9F5mLvF/SNe3rW1vTNPCLY5F+69lwyZk8njFJfowSs5ts78jJzXpo/PLgn agEHMOboU2pp/CSZ5Lr5m4YUvtDxmqX9HKkK8sYw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rob Herring , Bjorn Helgaas , Lorenzo Pieralisi , Arnd Bergmann , Sasha Levin Subject: [PATCH 4.19 082/206] PCI: Fix pci_register_host_bridge() device_register() error handling Date: Tue, 23 Jun 2020 21:56:50 +0200 Message-Id: <20200623195320.972725045@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195316.864547658@linuxfoundation.org> References: <20200623195316.864547658@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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(-) -- 2.25.1 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 243b65f3c282c..cbc0d8da7483c 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -818,9 +818,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);