From patchwork Mon May 17 14:00:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 440107 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1131135jac; Mon, 17 May 2021 07:15:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqFLTFjGo9qJ/gSdatD3dIYziTunZ7zKw+jW6d9V78lY8Wav4WUAeuETp5/HxKrIB5sfW1 X-Received: by 2002:a5d:818c:: with SMTP id u12mr164323ion.81.1621260951998; Mon, 17 May 2021 07:15:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621260951; cv=none; d=google.com; s=arc-20160816; b=woNpLCg9wVO6KrZpR7m+6piUEcRui54jhN/PK9DmsUYCbaWekrHIA6IXerNKM9AXE0 leb5Rqe2h3LniwSpeLTfk8zZfSuffk4S5AvDBOLeeRDMDlMK/GmKyONnWyV4+pzSrACW BZykfjX+XzyJyUtva2wGklHPHYxWOtuV9WuQGiaYI7I/v61d1qFrrmi+/8HI0B/PyojY Lr0rZdgQy9dMHY65Dj1znIT7BCdkp2yIbE3h+dVQKSJIfuCB9TPxabi+a4FhrMIB17w6 6rCXhHuRW5KAqzWAjqMrB3Olbc12BN8HcRu6Rz7tKS0E7oUo2zUcDEyr94a1eWf6ULMB QSZQ== 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=jaaD95FDBmMVb9dW0YQpsrQIss8npIaERDvMbJg91Ss=; b=makP4MSRCj6u8l/s4C4DUR1ggp+RvrJHcrBKWxG14H+LNpQx2tNvfk7moca/dV52HW 5sAgXF72h2bwFOHzJWHeglvN4ItMn3e6aVmL4Wa8nKbzZp0DClIIL9RhFqx2lhGB0T5b mr4x6IglZva5m6zxYtFiU0mxOTP5DyaBZVXzERuEUMpoySy+PlBB51FQ4Qpg9/J8ujCR pCuVCKEbZ72QmT9q7n7Bc909iKEe6ixAtRsDp7WGPwzWyKLagw9TpFxgQR9aSIkko6Gd AAPYBS6dZsyQXggwumCjoOFxrvkMDZMsRVdXDJg8UnsW0C/sMQMsmp7qS50dejZCkGpH W5Zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=P8l9CC3a; 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 p31si20298028jac.95.2021.05.17.07.15.51; Mon, 17 May 2021 07:15:51 -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=P8l9CC3a; 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 S238154AbhEQORE (ORCPT + 12 others); Mon, 17 May 2021 10:17:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:43504 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230211AbhEQOPJ (ORCPT ); Mon, 17 May 2021 10:15:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 234BA613F2; Mon, 17 May 2021 14:09:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621260559; bh=RUVuHS+F/d/46/TBsNU+jXzy2X9vN5usIJ0/c1wl9MI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P8l9CC3ayjlVu/hsikZUNv2UMKobIT70gcJY8sL7S38IDp7LNWR/vQdXN7p/bSUCJ nSIFLcX3V8egumMeDz/BgEpI4P/eINrCEMk1ymw7G499ED5C64Tnqp/pTII40/bwZs EfTKgbz8EnLaj8JM2XcqceX2BrvU6ja54dmgzT2k= 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.12 135/363] PCI: Release OF node in pci_scan_device()s error path Date: Mon, 17 May 2021 16:00:01 +0200 Message-Id: <20210517140307.186594675@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517140302.508966430@linuxfoundation.org> References: <20210517140302.508966430@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 953f15abc850..be51670572fa 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2353,6 +2353,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;