From f48b53a8e73279492bef0c5f2d5442954493c959 Mon Sep 17 00:00:00 2001
From: Eric Auger <eric.auger@redhat.com>
Date: Thu, 20 Jun 2019 10:51:09 +0800
Subject: [PATCH] iommu/vt-d: Fix leak in intel_pasid_alloc_table on error path

mainline inclusion
from mainline-v5.2-rc1
commit dca4d60f5f8c9263f8f66724fa4750abd32d8db0
category: bugfix
bugzilla: 15933
CVE: NA

-------------------------------------------------------------------------

If alloc_pages_node() fails, pasid_table is leaked. Free it.

Fixes: cc580e41260db ("iommu/vt-d: Per PCI device pasid table interfaces")

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/iommu/intel-pasid.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/iommu/intel-pasid.c b/drivers/iommu/intel-pasid.c
index fe95c9bd4d33..1a82ee1c6e3d 100644
--- a/drivers/iommu/intel-pasid.c
+++ b/drivers/iommu/intel-pasid.c
@@ -149,8 +149,10 @@ int intel_pasid_alloc_table(struct device *dev)
 	pages = alloc_pages_node(info->iommu->node,
 				 GFP_ATOMIC | __GFP_ZERO,
 				 order);
-	if (!pages)
+	if (!pages) {
+		kfree(pasid_table);
 		return -ENOMEM;
+	}
 
 	pasid_table->table = page_address(pages);
 	pasid_table->order = order;
-- 
GitLab