linux-kernel - [PATCH] iommu/vt-d: Propagate error-value from ir_parse_ioapic_hpet

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: <20151023100407.GB17032@8bytes.org>
Date:	Fri, 23 Oct 2015 12:04:07 +0200
From:	Joerg Roedel <joro@...tes.org>
To:	Baoquan He <bhe@...hat.com>
Cc:	linux-kernel@...r.kernel.org, iommu@...ts.linux-foundation.org
Subject: [PATCH] iommu/vt-d: Propagate error-value from
 ir_parse_ioapic_hpet_scope()

On Thu, Oct 22, 2015 at 02:00:51PM +0800, Baoquan He wrote:
> Adjust the return value of parse_ioapics_under_ir as negative value representing
> failure and "0" representing succcess. Just make it consistent with other
> function implementation, and we can judge if calling is successfull by
> if (!parse_ioapics_under_ir()) style.
> 
> Signed-off-by: Baoquan He <bhe@...hat.com>

Applied thanks. I also put below patch on-top to also propate the error
value returned from ir_parse_ioapic_hpet_scope().

>From 66ef950d1841487c852d68d00977726f1cd9f053 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <jroedel@...e.de>
Date: Fri, 23 Oct 2015 11:57:13 +0200
Subject: [PATCH] iommu/vt-d: Propagate error-value from
 ir_parse_ioapic_hpet_scope()

Propagate the error-value from the function ir_parse_ioapic_hpet_scope()
in parse_ioapics_under_ir() and cleanup its calling loop.

Signed-off-by: Joerg Roedel <jroedel@...e.de>
---
 drivers/iommu/intel_irq_remapping.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index 7843252..f3a9bd1 100644
--- a/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -934,13 +934,18 @@ static int __init parse_ioapics_under_ir(void)
 	bool ir_supported = false;
 	int ioapic_idx;
 
-	for_each_iommu(iommu, drhd)
-		if (ecap_ir_support(iommu->ecap)) {
-			if (ir_parse_ioapic_hpet_scope(drhd->hdr, iommu))
-				return -1;
+	for_each_iommu(iommu, drhd) {
+		int ret;
 
-			ir_supported = true;
-		}
+		if (!ecap_ir_support(iommu->ecap))
+			continue;
+
+		ret = ir_parse_ioapic_hpet_scope(drhd->hdr, iommu);
+		if (ret)
+			return ret;
+
+		ir_supported = true;
+	}
 
 	if (!ir_supported)
 		return -ENODEV;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/