From patchwork Tue Jun 23 19:58:31 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: 191574 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1348468ecs; Tue, 23 Jun 2020 13:54:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLGtWOR5g7qJoA1hGAY15C6Z0ObXl2DIoNPjuqTFPPqUBf09C2koN8+09dDQAvepBXtDoG X-Received: by 2002:a17:906:7b83:: with SMTP id s3mr3766896ejo.184.1592945680804; Tue, 23 Jun 2020 13:54:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592945680; cv=none; d=google.com; s=arc-20160816; b=pGa37VrI2J88xCdFmEWa6aBtonkWfHSByJckrD+v+w4+zzAjZ8PCxFYx/aFtjDpfci O8JkKYFZxrU4kxUTDQnzrfuBo0cleANR1siOvExO//NnnBalCFmotG6Zmpf2UVmGnvgW wMrJHvLliVdM03cOy1lmdeusAd0Yz0mdz/7e2NjQvgxvWS49QUGV668zVDuk3EVpPuW8 gMh+Swew4zopdS4F8UXQ6V2f1ocplsUqORCLwmWRu3H0CeaC7h3w+1K6KRObrJAVVb3O kApeamje4OTNaHMC4v+mza1KQ15+PknLEyUTtQ5uutQyoFSdS4ZA8eY8UPV9yTJdwy1a lCnw== 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=PU/hkE9lEjz0yygAgF7YCSk3XkeK3UWmyJacMPp+chE=; b=QynpzG4mX4zFKjw3NzZt8TTMaJUNqOO93Ity2WOJCtZjwvD4vv3RJ3Zt4BwGCtPsh9 M9YRj4N4Snyib3cg1khgjOuUV08IxlkpaDzTcaTPGwBHNkghm/Ueri3OW4VdhUFv7w7f 1tJ08VAZjvqod0LTCEoELd6dhtcK6I39LBCg2cl/N2v6zyR2jUT3aeniOTvsAQXATr2q CoOmh7xjSwBqbbfbqwgOUQaN6STyd1Dg9j1nXFOzEEZ8FxdkZXqazA6TPuNyvEv4Zg+8 Hilcv1kfdugE4GkHlbmAdvPyycUytqSGTCJtheEbSVwNwW+sFDubXeWqP2G/3W16ODQb ektA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xA2vAMw+; 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 i26si6290491ejy.58.2020.06.23.13.54.40; Tue, 23 Jun 2020 13:54:40 -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=xA2vAMw+; 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 S2392765AbgFWUyh (ORCPT + 15 others); Tue, 23 Jun 2020 16:54:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:43284 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392394AbgFWUpl (ORCPT ); Tue, 23 Jun 2020 16:45:41 -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 4A17520781; Tue, 23 Jun 2020 20:45:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945141; bh=M8WePFkO2RB60+1w99NmjnzDngSvR9I6iLpfPoEiAko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xA2vAMw+UBtnPzdsmfjTbTTXMFN/ImqDL4cSl8f+TF5KUJVdj2g5VTFlYubxNz6B/ 975G9Tvxg2+VL9kzamYAehcpk7ezjbwlFHE1ad/VAL0HOfJVROJqjAucEV8G38hKyx ddBF2p2ILog8y3u3S+zCt9meAyfblQMtQaGhw+N8= 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.14 055/136] PCI: Fix pci_register_host_bridge() device_register() error handling Date: Tue, 23 Jun 2020 21:58:31 +0200 Message-Id: <20200623195306.443001606@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195303.601828702@linuxfoundation.org> References: <20200623195303.601828702@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 31cc04aeaaaab..55ece07e584a0 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -792,9 +792,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);