diff options
| author | Wang Wensheng <wangwensheng4@huawei.com> | 2021-04-06 12:17:59 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-04-06 14:20:23 +0100 |
| commit | 52b9e265d22bccc5843e167da76ab119874e2883 (patch) | |
| tree | 36edbad23119ebd8b522cca623b97fb7a6bdd4eb /arch/arm64/kvm | |
| parent | 70f5e4a6017b8d45a110ebbb4a56799e9a90102f (diff) | |
KVM: arm64: Fix error return code in init_hyp_mode()
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
Diffstat (limited to 'arch/arm64/kvm')
| -rw-r--r-- | arch/arm64/kvm/arm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 7f06ba76698d..85261015ce5d 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1808,8 +1808,10 @@ static int init_hyp_mode(void) if (is_protected_kvm_enabled()) { init_cpu_logical_map(); - if (!init_psci_relay()) + if (!init_psci_relay()) { + err = -ENODEV; goto out_err; + } } return 0; |