[tip: x86/urgent] x86/sgx: Add missing xa_destroy() when virtual EPC is destroyed
From: tip-bot2 for Kai Huang
Date: Tue Jun 15 2021 - 12:16:29 EST
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 4692bc775d2180a937335ccba0edce557103d44a
Gitweb: https://git.kernel.org/tip/4692bc775d2180a937335ccba0edce557103d44a
Author: Kai Huang <kai.huang@xxxxxxxxx>
AuthorDate: Tue, 15 Jun 2021 22:16:39 +12:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Tue, 15 Jun 2021 18:03:45 +02:00
x86/sgx: Add missing xa_destroy() when virtual EPC is destroyed
xa_destroy() needs to be called to destroy a virtual EPC's page array
before calling kfree() to free the virtual EPC. Currently it is not
called so add the missing xa_destroy().
Fixes: 540745ddbc70 ("x86/sgx: Introduce virtual EPC for use by KVM guests")
Signed-off-by: Kai Huang <kai.huang@xxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Acked-by: Dave Hansen <dave.hansen@xxxxxxxxx>
Tested-by: Yang Zhong <yang.zhong@xxxxxxxxx>
Link: https://lkml.kernel.org/r/20210615101639.291929-1-kai.huang@xxxxxxxxx
---
arch/x86/kernel/cpu/sgx/virt.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/kernel/cpu/sgx/virt.c b/arch/x86/kernel/cpu/sgx/virt.c
index 6ad165a..64511c4 100644
--- a/arch/x86/kernel/cpu/sgx/virt.c
+++ b/arch/x86/kernel/cpu/sgx/virt.c
@@ -212,6 +212,7 @@ static int sgx_vepc_release(struct inode *inode, struct file *file)
list_splice_tail(&secs_pages, &zombie_secs_pages);
mutex_unlock(&zombie_secs_pages_lock);
+ xa_destroy(&vepc->page_array);
kfree(vepc);
return 0;