From patchwork Mon May 17 14:01:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 440121 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1164043jac; Mon, 17 May 2021 07:57:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2QR5saBGu3DutrNwJ349xbdlfQHrrOaTdksu8QRtVtRM2kPBCRs0B5XZuxdyJXcfV0/Gd X-Received: by 2002:a5d:9516:: with SMTP id d22mr307699iom.119.1621263443470; Mon, 17 May 2021 07:57:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621263443; cv=none; d=google.com; s=arc-20160816; b=HIOrz1IM2niXRCosrbbsPhSysCTfbjltC8c06cpnIn6eXuDu58sOuN1JsjJzzCYnUr 68VCTHVp9PIZtDItjSF7N5KEV1zqwrsICZPjh5c1C3JN5nZaQ5It3qI4fNoIulb1galk 5AN3Bbs20T4vn9qXZ8z/D07/gRHTbGkd3YEN2rJ3X7YayI12oYDYbVkZaDPs5hodSO/y O/mCMn3vlfYweyR0XDMbaAt6a3xQvU8jctjT+eLPWHJQVwujUGPoIFyw/Xr8uY9lU1nQ NiAe08E7ZgEPdo8BE/Hi0ckhIo3t4muAh0XUtqE1mELY24r72ixDn3QhM5BnOXFTk6W/ aXaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wtvZxyMr7ZBcGPMSXfKBLpASWbcS7vSkzgvnoDljVXI=; b=LUYoKb0iiacXGglv4DrXMxSperPG/TfwL/hyOJrOUl3vLIM49+LZbo2aEmBrWLA3tp DKjCpfxXHxCMocCQ4OOP+vcYZePqGrgfk9yXd+QOosm9dEKmbI1s//hKKGdZS3UB+6L6 UD5dR6uimeFan12fLCG7ZBw8SVty3aIf/G1ChwiQSgGkcUDp95QQufUl4rIvlqF3fbO7 l/gBLqXGVHB+FXHWmnO2Vu9aGIyfayHRZRWaAWAgMOTDoR1jLRh+33RjnvJ3IANYTGV3 hbM0w+cm/LS4P/9VdPXJmUc+OMQFPdjltZB6urjA2aURavldV/WoR4H5vS1doPFbpwUO BD6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=s87X4qHv; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u10si5255177jad.109.2021.05.17.07.57.23; Mon, 17 May 2021 07:57:23 -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=@linuxfoundation.org header.s=korg header.b=s87X4qHv; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241751AbhEQO6i (ORCPT + 12 others); Mon, 17 May 2021 10:58:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:48864 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241445AbhEQO4d (ORCPT ); Mon, 17 May 2021 10:56:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id ECA3A61461; Mon, 17 May 2021 14:25:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621261523; bh=hISiHKXy4fjF+fnofFcE4ObV9ndzfkPj5CZlHHLM23Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s87X4qHvuSwB4Q5CRZnpzi0l7Ckhb1bBQ5Mqs930s9TjDn811+05FTjj/JhbiLenP A/1u2PpmnIeszJYN+DIvg8AhGpGRHbVyPAT5UpOyhFvZTHO4rb4P6I5/mrpnQnOk1E 5QNMY04pTBcpq/3PZAlNkmCmbNuTgXUWGDz/L0sw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Baryshkov , Bjorn Helgaas , Leon Romanovsky , Sasha Levin Subject: [PATCH 5.4 055/141] PCI: Release OF node in pci_scan_device()s error path Date: Mon, 17 May 2021 16:01:47 +0200 Message-Id: <20210517140244.615679366@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517140242.729269392@linuxfoundation.org> References: <20210517140242.729269392@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dmitry Baryshkov [ Upstream commit c99e755a4a4c165cad6effb39faffd0f3377c02d ] In pci_scan_device(), if pci_setup_device() fails for any reason, the code will not release device's of_node by calling pci_release_of_node(). Fix that by calling the release function. Fixes: 98d9f30c820d ("pci/of: Match PCI devices to OF nodes dynamically") Link: https://lore.kernel.org/r/20210124232826.1879-1-dmitry.baryshkov@linaro.org Signed-off-by: Dmitry Baryshkov Signed-off-by: Bjorn Helgaas Reviewed-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/pci/probe.c | 1 + 1 file changed, 1 insertion(+) -- 2.30.2 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 8fa13486f2f1..f28213b62527 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2299,6 +2299,7 @@ static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn) pci_set_of_node(dev); if (pci_setup_device(dev)) { + pci_release_of_node(dev); pci_bus_put(dev->bus); kfree(dev); return NULL;