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 15B5A1E895; Thu, 25 Jul 2024 14:49:02 +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=1721918942; cv=none; b=Put5xeWhXK7fgHXYfLr26iL4hTMFEBE5vt+rkM51Wgb/0i+XT9MhbYOumXvgXZ24+hkU0s2ZpxA6S+bFSMy0WheIj+mybBe7Vk3ENNzVPYgvHQ3FCMVZc7xfXDR7StVAJwNLiCZNsvqR9xPjn44Be7TGvF2H/6PAiRZiCio8tQM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721918942; c=relaxed/simple; bh=sIHkftenhD3ydHk9iIDUARkVQvv7WTNWBw+sJOQuptw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VBAj/ZF0SszAE30S7+lU8XJwzJflPG7CPn1LvjxQdj5oU+foxVBoo1baIyhSSs2N+dYUisZTdo4V8OIC2sz+fgIhsXWjWaQDhCZ5+3zB+96UoPM1NnZyTF1AFj9yOY22qNrFri2FPTNUqRX6IDTB8H+l6C/fibO81KAaSz3UakA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hcNZ6qS+; 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="hcNZ6qS+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 928D6C116B1; Thu, 25 Jul 2024 14:49:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721918942; bh=sIHkftenhD3ydHk9iIDUARkVQvv7WTNWBw+sJOQuptw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hcNZ6qS+DbMcUzPe9dw1PPnfLdOyAdwOHam1+eN7jx8vwX4Dal7btq/Bo4VxQZj2C 19ZU6yQU+DI1562aT7EV5TsVYg82APkwpbK6zAQ/wLqAuc3UdYDBqHeLZ3CHapjI/0 voVZwUzl3GMh2fDpWzZsSwx4QgN/5uGn9ZBc1FSw= 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 5.10 36/59] powerpc/eeh: avoid possible crash when edev->pdev changes Date: Thu, 25 Jul 2024 16:37:26 +0200 Message-ID: <20240725142734.627947914@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240725142733.262322603@linuxfoundation.org> References: <20240725142733.262322603@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-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 845e024321d47..a856d9ba42d20 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