We already sanitize the guest's PSCI version when it is being written by
userspace, rejecting unsupported version numbers. Additionally, the
'minor' parameter to kvm_psci_1_x_call() is a constant known at compile
time for all callsites.
Though it is benign, the additional check against the
PSCI kvm_psci_1_x_call() is unnecessary and likely to be missed the next
time KVM raises its maximum PSCI version. Drop the check altogether and
rely on sanitization when the PSCI version is set by userspace.
No functional change intended.
Signed-off-by: Oliver Upton <oupton@xxxxxxxxxx>
---
Sorry for not sending this with the other ones. I took another read and
do not believe this check is necessary + might hurt when we raise the
PSCI version again.
Applies on top of the series [1], which itself is based on kvmarm/next
at commit:
21ea45784275 ("KVM: arm64: fix typos in comments")
[1]: http://lore.kernel.org/r/20220318193831.482349-1-oupton@xxxxxxxxxx
arch/arm64/kvm/psci.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/arm64/kvm/psci.c b/arch/arm64/kvm/psci.c
index 0d771468b708..7cd3fe62275f 100644
--- a/arch/arm64/kvm/psci.c
+++ b/arch/arm64/kvm/psci.c
@@ -315,9 +315,6 @@ static int kvm_psci_1_x_call(struct kvm_vcpu *vcpu, u32 minor)
unsigned long val;
int ret = 1;
- if (minor > 1)
- return -EINVAL;
-
val = kvm_psci_check_allowed_function(vcpu, psci_fn);
if (val)
goto out;
--
2.35.1.894.gb6a874cedc-goog
