linux-kernel - [PATCH v2] iommu/arm-smmu-v3: Free MSIs in case of ENOMEM

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: <20240403053759.643164-1-aaprelkov@usergate.com>
Date: Wed, 3 Apr 2024 12:37:59 +0700
From: Aleksandr Aprelkov <aaprelkov@...rgate.com>
To: Will Deacon <will@...nel.org>
CC: Aleksandr Aprelkov <aaprelkov@...rgate.com>,Robin Murphy <robin.murphy@....com>,Joerg Roedel <joro@...tes.org>,Jason Gunthorpe <jgg@...pe.ca>,Nicolin Chen <nicolinc@...dia.com>,Michael Shavit <mshavit@...gle.com>,Lu Baolu <baolu.lu@...ux.intel.com>,Marc Zyngier <maz@...nel.org>,<linux-arm-kernel@...ts.infradead.org>,<iommu@...ts.linux.dev>,<linux-kernel@...r.kernel.org>
Subject: [PATCH v2] iommu/arm-smmu-v3: Free MSIs in case of ENOMEM

If devm_add_action() returns ENOMEM, then MSIs allocated but
not freed on teardown.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 166bdbd23161 ("iommu/arm-smmu: Add support for MSI on SMMUv3")
Signed-off-by: Aleksandr Aprelkov <aaprelkov@...rgate.com>
---
v2: Use appropriate function for registration failure as 
Jonathan Cameron <Jonathan.Cameron@...wei.com> suggested.

 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index 41f93c3ab160..8800af041e5f 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -3402,7 +3402,9 @@ static void arm_smmu_setup_msis(struct arm_smmu_device *smmu)
 	smmu->priq.q.irq = msi_get_virq(dev, PRIQ_MSI_INDEX);
 
 	/* Add callback to free MSIs on teardown */
-	devm_add_action(dev, arm_smmu_free_msis, dev);
+	ret = devm_add_action_or_reset(dev, arm_smmu_free_msis, dev);
+	if (ret)
+		dev_warn(dev, "failed to add free MSIs callback - falling back to wired irqs\n");
 }
 
 static void arm_smmu_setup_unique_irqs(struct arm_smmu_device *smmu)
-- 
2.34.1