From 841fe8d573911984f7d9ebe94d32fea000cfaece Mon Sep 17 00:00:00 2001
From: Prakash Gupta <guptap@codeaurora.org>
Date: Tue, 11 Feb 2020 16:26:47 +0530
Subject: [PATCH] iommu: arm-smmu: Fix domain logger use-after-free

smmu_domain logger is freed as part of error handling in
arm_smmu_init_domain_context.  But smmu_domain->logger is still non null.
This cause smmu_domain->logger to be accessed during domain free.  Fix
this.

Fixes: f1746fc8a009 ("iommu: qti: Track iommu domains")
Change-Id: I82a7f9121b78ca9338d202694dbc0a98150f0c92
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
---
 drivers/iommu/arm-smmu.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 6d78d6b53299..be1997116a15 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -2102,6 +2102,7 @@ out_clear_smmu:
 	smmu_domain->smmu = NULL;
 out_logger:
 	iommu_logger_unregister(smmu_domain->logger);
+	smmu_domain->logger = NULL;
 out_unlock:
 	mutex_unlock(&smmu_domain->init_mutex);
 	return ret;