linux-kernel - [tip: irq/msi] PCI/MSI: Unmap MSI-X region on error

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: <176941778179.510.14598280314675299233.tip-bot2@tip-bot2>
Date: Mon, 26 Jan 2026 08:56:21 -0000
From: "tip-bot2 for Haoxiang Li" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Haoxiang Li <lihaoxiang@...c.iscas.ac.cn>,
 Thomas Gleixner <tglx@...nel.org>, x86@...nel.org,
 linux-kernel@...r.kernel.org
Subject: [tip: irq/msi] PCI/MSI: Unmap MSI-X region on error

The following commit has been merged into the irq/msi branch of tip:

Commit-ID:     1a8d4c6ecb4c81261bcdf13556abd4a958eca202
Gitweb:        https://git.kernel.org/tip/1a8d4c6ecb4c81261bcdf13556abd4a958eca202
Author:        Haoxiang Li <lihaoxiang@...c.iscas.ac.cn>
AuthorDate:    Sun, 25 Jan 2026 22:44:52 +08:00
Committer:     Thomas Gleixner <tglx@...nel.org>
CommitterDate: Mon, 26 Jan 2026 09:46:48 +01:00

PCI/MSI: Unmap MSI-X region on error

msix_capability_init() fails to unmap the MSI-X region if
msix_setup_interrupts() fails.

Add the missing iounmap() for that error path.

[ tglx: Massaged change log ]

Signed-off-by: Haoxiang Li <lihaoxiang@...c.iscas.ac.cn>
Signed-off-by: Thomas Gleixner <tglx@...nel.org>
Link: https://patch.msgid.link/20260125144452.2103812-1-lihaoxiang@isrc.iscas.ac.cn
---
 drivers/pci/msi/msi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c
index 34d6641..e010ecd 100644
--- a/drivers/pci/msi/msi.c
+++ b/drivers/pci/msi/msi.c
@@ -737,7 +737,7 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
 
 	ret = msix_setup_interrupts(dev, entries, nvec, affd);
 	if (ret)
-		goto out_disable;
+		goto out_unmap;
 
 	/* Disable INTX */
 	pci_intx_for_msi(dev, 0);
@@ -758,6 +758,8 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
 	pcibios_free_irq(dev);
 	return 0;
 
+out_unmap:
+	iounmap(dev->msix_base);
 out_disable:
 	dev->msix_enabled = 0;
 	pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL | PCI_MSIX_FLAGS_ENABLE, 0);