From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 22DF51586F5; Tue, 23 Jul 2024 18:36:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759787; cv=none; b=CGIIPcJBdbEZJ1VUmOELgMSor5bFPMZ2ufOfQvA5MlFizkjArnphYrXv3mNlyy8q5yMBEPRyLxcL81OrIPJHHg/xfvoSzl0ndaWknGqUqBRK9G2QXzRURslEQco3HM1PuAsTCdTGWMP5bqt2f3XFUrS1Osf8qgp5S3z1SJjQp4I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759787; c=relaxed/simple; bh=r1btFnsIuatzO3U7z4zxJjmRfX20BAnO5SMCq1b6bVo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p0Vnm5bMFeKGuEfTkaIqCAtgs5ATVhE61A+s2PEiLQ/sVmF775FMq2lLXbljJmt7O/gMDjGVo3r2uQGs309WWk/11yZ6FFrdio+JPOqpqe7Ds+URYGfzBatWpOdM9djOY7/3MMLePURFitWlXAU4d9wm02qXqNzx3xw1vapdRGg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wp4RgNVM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="wp4RgNVM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A119C4AF0A; Tue, 23 Jul 2024 18:36:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721759783; bh=r1btFnsIuatzO3U7z4zxJjmRfX20BAnO5SMCq1b6bVo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wp4RgNVMVy53dUck2aVePN9CAXbcEy975coAAGN+fBjDrAcYkNRsuWRjBM0qbDl9v HOKobweNBzZfkFVcs2KZzUh7F1YftfaBCHD7bHw9xqThoSDrMec/jAMRXCbc82Ug4o snk7o2j4iGg9fWArXM2F8GP6ONrsSmxZE5qvOC48= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ganesh Goudar , Michael Ellerman , Sasha Levin Subject: [PATCH 6.6 095/129] powerpc/eeh: avoid possible crash when edev->pdev changes Date: Tue, 23 Jul 2024 20:24:03 +0200 Message-ID: <20240723180408.457727275@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723180404.759900207@linuxfoundation.org> References: <20240723180404.759900207@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ganesh Goudar [ Upstream commit a1216e62d039bf63a539bbe718536ec789a853dd ] If a PCI device is removed during eeh_pe_report_edev(), edev->pdev will change and can cause a crash, hold the PCI rescan/remove lock while taking a copy of edev->pdev->bus. Signed-off-by: Ganesh Goudar Signed-off-by: Michael Ellerman Link: https://msgid.link/20240617140240.580453-1-ganeshgr@linux.ibm.com Signed-off-by: Sasha Levin --- arch/powerpc/kernel/eeh_pe.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/eeh_pe.c b/arch/powerpc/kernel/eeh_pe.c index e0ce812796241..7d1b50599dd6c 100644 --- a/arch/powerpc/kernel/eeh_pe.c +++ b/arch/powerpc/kernel/eeh_pe.c @@ -849,6 +849,7 @@ struct pci_bus *eeh_pe_bus_get(struct eeh_pe *pe) { struct eeh_dev *edev; struct pci_dev *pdev; + struct pci_bus *bus = NULL; if (pe->type & EEH_PE_PHB) return pe->phb->bus; @@ -859,9 +860,11 @@ struct pci_bus *eeh_pe_bus_get(struct eeh_pe *pe) /* Retrieve the parent PCI bus of first (top) PCI device */ edev = list_first_entry_or_null(&pe->edevs, struct eeh_dev, entry); + pci_lock_rescan_remove(); pdev = eeh_dev_to_pci_dev(edev); if (pdev) - return pdev->bus; + bus = pdev->bus; + pci_unlock_rescan_remove(); - return NULL; + return bus; } -- 2.43.0