linux-kernel - [tip: x86/misc] x86/pci/xen: Fix PCIBIOS

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-prev] [day] [month] [year] [list]

Message-ID: <171925126034.10875.8363039612828954865.tip-bot2@tip-bot2>
Date: Mon, 24 Jun 2024 17:47:40 -0000
From: tip-bot2 for Ilpo Järvinen <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: ilpo.jarvinen@...ux.intel.com, "Borislav Petkov (AMD)" <bp@...en8.de>,
 Juergen Gross <jgross@...e.com>, x86@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip: x86/misc] x86/pci/xen: Fix PCIBIOS_* return code handling

The following commit has been merged into the x86/misc branch of tip:

Commit-ID:     e9d7b435dfaec58432f4106aaa632bf39f52ce9f
Gitweb:        https://git.kernel.org/tip/e9d7b435dfaec58432f4106aaa632bf39f52ce9f
Author:        Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
AuthorDate:    Mon, 27 May 2024 15:55:37 +03:00
Committer:     Borislav Petkov (AMD) <bp@...en8.de>
CommitterDate: Mon, 24 Jun 2024 19:21:25 +02:00

x86/pci/xen: Fix PCIBIOS_* return code handling

xen_pcifront_enable_irq() uses pci_read_config_byte() that returns
PCIBIOS_* codes. The error handling, however, assumes the codes are
normal errnos because it checks for < 0.

xen_pcifront_enable_irq() also returns the PCIBIOS_* code back to the
caller but the function is used as the (*pcibios_enable_irq) function
which should return normal errnos.

Convert the error check to plain non-zero check which works for
PCIBIOS_* return codes and convert the PCIBIOS_* return code using
pcibios_err_to_errno() into normal errno before returning it.

Fixes: 3f2a230caf21 ("xen: handled remapped IRQs when enabling a pcifront PCI device.")
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@...en8.de>
Reviewed-by: Juergen Gross <jgross@...e.com>
Link: https://lore.kernel.org/r/20240527125538.13620-3-ilpo.jarvinen@linux.intel.com
---
 arch/x86/pci/xen.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 652cd53..0f2fe52 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -38,10 +38,10 @@ static int xen_pcifront_enable_irq(struct pci_dev *dev)
 	u8 gsi;
 
 	rc = pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &gsi);
-	if (rc < 0) {
+	if (rc) {
 		dev_warn(&dev->dev, "Xen PCI: failed to read interrupt line: %d\n",
 			 rc);
-		return rc;
+		return pcibios_err_to_errno(rc);
 	}
 	/* In PV DomU the Xen PCI backend puts the PIRQ in the interrupt line.*/
 	pirq = gsi;