From 52273e667fad2fe458af8c09105df7a82b51d610 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:48:51 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Fix ToCToU issue when refilling the hyp memcache" This reverts commit 0957aec08110b6bcce4c7c21835d2fe2a0a92005. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: Id838e47d103f6a9100ae042b73abb2e907f63aa0 --- arch/arm64/kvm/hyp/nvhe/mm.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/mm.c b/arch/arm64/kvm/hyp/nvhe/mm.c index 4e86a2123c05..6239fea7496b 100644 --- a/arch/arm64/kvm/hyp/nvhe/mm.c +++ b/arch/arm64/kvm/hyp/nvhe/mm.c @@ -331,12 +331,6 @@ static void *admit_host_page(void *arg) int refill_memcache(struct kvm_hyp_memcache *mc, unsigned long min_pages, struct kvm_hyp_memcache *host_mc) { - struct kvm_hyp_memcache tmp = *host_mc; - int ret; - - ret = __topup_hyp_memcache(mc, min_pages, admit_host_page, - hyp_virt_to_phys, &tmp); - *host_mc = tmp; - - return ret; + return __topup_hyp_memcache(mc, min_pages, admit_host_page, + hyp_virt_to_phys, host_mc); }