shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: KVM: arm64: Addr sanity check for pKVM HVC registration

Browse Source 
Use the assert_in_mod_range() to validate the registered callback is
part of a module VA space. This feature requires CONFIG_NVHE_EL2_DEBUG.

Bug: 269245057
Change-Id: I4c4d60ac77882fc2d36c3c73b096f4ba9afb83e5
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
This commit is contained in:
Vincent Donnefort
2023-02-22 14:17:37 +00:00
committed by Treehugger Robot
parent 650081b837
commit 9bd4244ba7
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm64/kvm/hyp/include/nvhe/mm.h
View File

@@ -34,4 +34,9 @@ void pkvm_remove_mappings(void *from, void *to);
int __pkvm_map_module_page(u64 pfn, void *va, enum kvm_pgtable_prot prot, bool is_protected);
void __pkvm_unmap_module_page(u64 pfn, void *va);
void *__pkvm_alloc_module_va(u64 nr_pages);
#ifdef CONFIG_NVHE_EL2_DEBUG
void assert_in_mod_range(unsigned long addr);
#else
static inline void assert_in_mod_range(unsigned long addr) { }
#endif /* CONFIG_NVHE_EL2_DEBUG */
#endif /* __KVM_HYP_MM_H */

3
arch/arm64/kvm/hyp/nvhe/mm.c
View File

@@ -115,7 +115,7 @@ static void update_mod_range(unsigned long addr, size_t size)
hyp_spin_unlock(&mod_range_lock);
}
static void assert_in_mod_range(unsigned long addr)
void assert_in_mod_range(unsigned long addr)
{
/*
* This is not entirely watertight if there are private range
@@ -128,7 +128,6 @@ static void assert_in_mod_range(unsigned long addr)
}
#else
static inline void update_mod_range(unsigned long addr, size_t size) { }
static inline void assert_in_mod_range(unsigned long addr) { }
#endif
void *__pkvm_alloc_module_va(u64 nr_pages)

2
arch/arm64/kvm/hyp/nvhe/modules.c
View File

@@ -137,6 +137,8 @@ int __pkvm_register_hcall(unsigned long hvn_hyp_va)
dyn_hcall_t hfn = (void *)hvn_hyp_va;
int reserved_id, ret;
assert_in_mod_range(hvn_hyp_va);
hyp_spin_lock(&dyn_hcall_lock);
reserved_id = atomic_read(&num_dynamic_hcalls);