linux-kernel - [PATCH] PCI: fix link retrain status in pcie_wait_for_link

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240313094938.484113-1-simon.guinot@seagate.com>
Date: Wed, 13 Mar 2024 10:49:38 +0100
From: Simon Guinot <simon.guinot@...gate.com>
To: Bjorn Helgaas <bhelgaas@...gle.com>
Cc: "Maciej W . Rozycki" <macro@...am.me.uk>,
	linux-pci@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Simon Guinot <simon.guinot@...gate.com>,
	stable@...r.kernel.org
Subject: [PATCH] PCI: fix link retrain status in pcie_wait_for_link_delay()

The current code in pcie_wait_for_link_delay() handles the value
returned by pcie_failed_link_retrain() as an integer, expecting 0
when the link has been successfully retrained. The issue is that
pcie_failed_link_retrain() returns a boolean: "true" if the link
has been successfully retrained and "false" otherwise. This leads
pcie_wait_for_link_delay() to return an incorrect "active link"
status when pcie_failed_link_retrain() is called.

This patch fixes the check of the value returned by
pcie_failed_link_retrain() in pcie_wait_for_link_delay().

Note that this bug induces abnormal timeout delays when a PCI device
is unplugged (around 60 seconds per bridge / secondary bus removed).

Cc: stable@...r.kernel.org
Fixes: 1abb47390350 ("Merge branch 'pci/enumeration'")
Signed-off-by: Simon Guinot <simon.guinot@...gate.com>
---
 drivers/pci/pci.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index ccee56615f78..7ec91b4c5d03 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -5101,9 +5101,7 @@ static bool pcie_wait_for_link_delay(struct pci_dev *pdev, bool active,
 		msleep(20);
 	rc = pcie_wait_for_link_status(pdev, false, active);
 	if (active) {
-		if (rc)
-			rc = pcie_failed_link_retrain(pdev);
-		if (rc)
+		if (rc && !pcie_failed_link_retrain(pdev))
 			return false;

 		msleep(delay);
-- 
2.43.0