xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: KVM: arm64: Fix error return code in init_hyp_mode()

Browse Source 
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: eeeee7193df0 ("KVM: arm64: Bootstrap PSCI SMC handler in nVHE EL2")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Wensheng <wangwensheng4@huawei.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210406121759.5407-1-wangwensheng4@huawei.com
(cherry picked from commit 52b9e265d22bccc5843e167da76ab119874e2883)
Bug: 187129171
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: Iaac1f2e2d7f99fe0d2337533eeaf8aa79623e224
This commit is contained in:
Wang Wensheng
2021-04-06 12:17:59 +00:00
committed by Connor O'Brien
parent 67d005b0ac
commit 52ce94e8bf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/kvm/arm.c
View File

@@ -1888,9 +1888,11 @@ static int init_hyp_mode(void)
if (is_protected_kvm_enabled()) { if (is_protected_kvm_enabled()) {
init_cpu_logical_map(); init_cpu_logical_map();
if (!init_psci_relay()) if (!init_psci_relay()) {
err = -ENODEV;
goto out_err; goto out_err;
} }
}
if (is_protected_kvm_enabled()) { if (is_protected_kvm_enabled()) {
err = kvm_hyp_init_protection(hyp_va_bits); err = kvm_hyp_init_protection(hyp_va_bits);