From patchwork Tue Jun 23 19:53:18 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: 191614 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1373850ecs; Tue, 23 Jun 2020 14:36:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZO8ec29NP37yGwWUAOWFw6ySnCA3i1m2I3GIjLorlKiOVW7uzPPN/0V9s3+uaZWgUSEEE X-Received: by 2002:a17:907:a92:: with SMTP id by18mr5416031ejc.116.1592948203482; Tue, 23 Jun 2020 14:36:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592948203; cv=none; d=google.com; s=arc-20160816; b=yJ0Ym4Nr46jWW60MxlmQDni2x5Bjo4GJTB2I8KGlNEgdZiQsOUH4kMNDOH2T8iHAMY 97WM+xvqpPj3l4NRCAZEL/g1kmfyvBtr1Mjn01o6wDmUfRO1HKDCtJr+9Y1PSQdDhpb5 E/bQVNh3N/jg4giwviFxTxF6onQRPpk2Qyd4aNYeCrQe/rXOwdfUtizH24onOC8HHmEW brw0LVQH6vhFViWQqVrjdRTY8a/Wbg6MaP9wlp5NRjtK+MZGnIE5WjiLouK4gHW/VCZU +pI5Ux9d6Xi+Z2NQFjafc3sBtMmyLVUGnLxAGEYui6oDGdXUf9XrFl6WcmQTw24GXjhy 9A9A== 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=OcFA+rbptxjD3MvavLG22UVLP0A9S9bDV+1jGixB3M0=; b=YT8tXJYMUugk6y0okPE6jwgtIRy5Ss2r7Iqric3dWmMrYa+5NUkel+YEv/lpERen/U 3nxj9THGgaNtegRIIqxlRJT1a741ydDFyRZ3U0VGovzOHGHcKNOH8gdOSw5W76np6YZG Smw2EfRvs2T1MB9sl+1AegA/DlhGb6h30DAI2Ku9+gwX0Y+Ng0tkQqFR6m/uCdtm7n9I J0WRlcyZ5IAIVan3a0PKXlsGk2VBKrI8rWWRGNBbFGVVsnX1ONKYMO/Lj3wQFCsvfujl Dfme0MaI6wmT6tI5FrF0KyGNUTkKPaqa1PnJtKANxPX4shvIdZEej7wtfO+KGcEbqGmG bI4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WhJVXu0E; 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 cx19si11501351edb.395.2020.06.23.14.36.43; Tue, 23 Jun 2020 14:36:43 -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=WhJVXu0E; 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 S2388737AbgFWUJg (ORCPT + 15 others); Tue, 23 Jun 2020 16:09:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:50706 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388729AbgFWUJd (ORCPT ); Tue, 23 Jun 2020 16:09:33 -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 C46C92082F; Tue, 23 Jun 2020 20:09:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942973; bh=JwxtI2utEs1b1MKZ4s6+Ql5C+ZhqlhprJ0fgj2lpBNg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WhJVXu0E64EEEHSopWOYOTsdmDumPd3Vg+Sl397Jr8qvPh1ZAlp7TF50VUySUxTOX uqRZlMpCFV9QT0/mGDbAksTeCX+TE5iGhi0zX1EjYkh0ftRJSd5EaUx/suLIq0sT2k fCAMOsz0+VrxUa7XSJ/wNejf6fINpAbc7GVaaxtM= 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 5.7 201/477] PCI: Fix pci_register_host_bridge() device_register() error handling Date: Tue, 23 Jun 2020 21:53:18 +0200 Message-Id: <20200623195417.087167445@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@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 c7e3a8267521b..b59a4b0f5f162 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);