From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D03BDC3600B for ; Mon, 31 Mar 2025 14:43:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=x8YjOY7SCOQNJDlYzYz619z9H3bcmY/r8WJ2JEsI6Lc=; b=bPTBQC8Ug6XWXH/Me3NLbLptqP YYq+rmfM0szDNMyaPxc0o7WYPcVe2ztgvr1JcAQjEgVawbdz2NA6aEUAdCrIIEChFlej153kxM2Sf Nx2FPHDqG6Sct1EJ8qt/d+e2sjL7Sf3PexgzkNIFcyYDHMQa/jGu96A2E4rN2jI8TAT9ldyQjmIqV AuKg4T5Ut1a0lMr+ogFWSDM92tAd/vzNxPzyOm+sd0qKDUMw0POq075H/BeTEPFAXMdzfk9/oxZU/ 0oDjrdxTq2/M2shySrCKwhMlNqf85n5y+MG2qtccY8JZmbxbsJKRLtDmQyvJ32+Evs9S1KMp0yUA9 PwYXCUvw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1tzGMJ-00000000bua-2fzE; Mon, 31 Mar 2025 14:43:27 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1tzGDj-00000000ZUD-3Pcp for linux-arm-kernel@lists.infradead.org; Mon, 31 Mar 2025 14:34:37 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 42181A41BCF; Mon, 31 Mar 2025 14:29:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84580C4CEE9; Mon, 31 Mar 2025 14:34:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743431674; bh=RbGuvqY2Py6/CSNYRkaEEr45J/MeGhBOFxWvpr/kSLI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J0+5UDXHwMCgTgrY5WglDTyvRcFJA9xJe8BV6Jr53vHp3dfrrz8mx7zSjA9LKDZL6 enuzTGydy3mzZlGK5vOZAOvEsCs0zWI7FL0/pL2AnXuHESJHNmCrHWRK2bqQsKEU6M t1jEixFknVoAAc7OiGo9Xb69vEMSPpARvYiwB8li5O0vSt+8eh5rBe0efrA8GOYd7p pCvPXYFbRNU5cizwtprolbFmMVhCZxERPn0uRdpfDGukl8IES6C8fKEa6wcnRxaakt VarJg8dx3Sne/gxiw9HwtIsdHPMLw83Oogs+E4/hpQN0yhvqFGN+ePFeEkypDnqPEX LUnuIwes+/+DQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yunhui Cui , Shuai Xue , Will Deacon , Sasha Levin , renyu.zj@linux.alibaba.com, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Subject: [PATCH AUTOSEL 6.14 10/18] perf/dwc_pcie: fix duplicate pci_dev devices Date: Mon, 31 Mar 2025 10:34:00 -0400 Message-Id: <20250331143409.1682789-10-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250331143409.1682789-1-sashal@kernel.org> References: <20250331143409.1682789-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250331_073435_976996_485D7752 X-CRM114-Status: GOOD ( 13.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Yunhui Cui [ Upstream commit 7f35b429802a8065aa61e2a3f567089649f4d98e ] During platform_device_register, wrongly using struct device pci_dev as platform_data caused a kmemdup copy of pci_dev. Worse still, accessing the duplicated device leads to list corruption as its mutex content (e.g., list, magic) remains the same as the original. Signed-off-by: Yunhui Cui Reviewed-by: Shuai Xue Link: https://lore.kernel.org/r/20250220121716.50324-3-cuiyunhui@bytedance.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/perf/dwc_pcie_pmu.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/perf/dwc_pcie_pmu.c b/drivers/perf/dwc_pcie_pmu.c index 19fa2ba8dd670..f851e070760c5 100644 --- a/drivers/perf/dwc_pcie_pmu.c +++ b/drivers/perf/dwc_pcie_pmu.c @@ -565,9 +565,7 @@ static int dwc_pcie_register_dev(struct pci_dev *pdev) u32 sbdf; sbdf = (pci_domain_nr(pdev->bus) << 16) | PCI_DEVID(pdev->bus->number, pdev->devfn); - plat_dev = platform_device_register_data(NULL, "dwc_pcie_pmu", sbdf, - pdev, sizeof(*pdev)); - + plat_dev = platform_device_register_simple("dwc_pcie_pmu", sbdf, NULL, 0); if (IS_ERR(plat_dev)) return PTR_ERR(plat_dev); @@ -616,18 +614,26 @@ static struct notifier_block dwc_pcie_pmu_nb = { static int dwc_pcie_pmu_probe(struct platform_device *plat_dev) { - struct pci_dev *pdev = plat_dev->dev.platform_data; + struct pci_dev *pdev; struct dwc_pcie_pmu *pcie_pmu; char *name; u32 sbdf; u16 vsec; int ret; + sbdf = plat_dev->id; + pdev = pci_get_domain_bus_and_slot(sbdf >> 16, PCI_BUS_NUM(sbdf & 0xffff), + sbdf & 0xff); + if (!pdev) { + pr_err("No pdev found for the sbdf 0x%x\n", sbdf); + return -ENODEV; + } + vsec = dwc_pcie_des_cap(pdev); if (!vsec) return -ENODEV; - sbdf = plat_dev->id; + pci_dev_put(pdev); name = devm_kasprintf(&plat_dev->dev, GFP_KERNEL, "dwc_rootport_%x", sbdf); if (!name) return -ENOMEM; @@ -642,7 +648,7 @@ static int dwc_pcie_pmu_probe(struct platform_device *plat_dev) pcie_pmu->on_cpu = -1; pcie_pmu->pmu = (struct pmu){ .name = name, - .parent = &pdev->dev, + .parent = &plat_dev->dev, .module = THIS_MODULE, .attr_groups = dwc_pcie_attr_groups, .capabilities = PERF_PMU_CAP_NO_EXCLUDE, -- 2.39.5