From: Dan Carpenter Date: Thu, 12 Mar 2020 11:37:30 +0000 Subject: [PATCH] iommu/vt-d: Unlock on error paths Message-Id: <20200312113730.GF20562@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: David Woodhouse , Megha Dey Cc: kernel-janitors@vger.kernel.org, iommu@lists.linux-foundation.org There were a couple places where we need to unlock before returning. Fixes: 91391b919e19 ("iommu/vt-d: Populate debugfs if IOMMUs are detected") Signed-off-by: Dan Carpenter --- drivers/iommu/intel-iommu-debugfs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/intel-iommu-debugfs.c b/drivers/iommu/intel-iommu-debugfs.c index 8d24c4d85cc2..6a495b103972 100644 --- a/drivers/iommu/intel-iommu-debugfs.c +++ b/drivers/iommu/intel-iommu-debugfs.c @@ -289,11 +289,12 @@ static int dmar_translation_struct_show(struct seq_file *m, void *unused) sts = dmar_readl(iommu->reg + DMAR_GSTS_REG); if (!(sts & DMA_GSTS_TES)) { seq_puts(m, "DMA Remapping is not enabled\n"); - return 0; + goto unlock; } root_tbl_walk(m, iommu); seq_putc(m, '\n'); } +unlock: rcu_read_unlock(); return 0; @@ -444,7 +445,7 @@ static int ir_translation_struct_show(struct seq_file *m, void *unused) sts = dmar_readl(iommu->reg + DMAR_GSTS_REG); if (!(sts & DMA_GSTS_IRES)) { seq_puts(m, "Interrupt Remapping is not enabled\n"); - return 0; + goto unlock; } if (iommu->ir_table) { @@ -475,6 +476,7 @@ static int ir_translation_struct_show(struct seq_file *m, void *unused) } seq_putc(m, '\n'); } +unlock: rcu_read_unlock(); return 0; -- 2.20.1