Commit 8c47b6ff authored by Laurent Dufour's avatar Laurent Dufour Committed by Paul Mackerras

KVM: PPC: Book3S HV: Check caller of H_SVM_* Hcalls

The Hcall named H_SVM_* are reserved to the Ultravisor. However, nothing
prevent a malicious VM or SVM to call them. This could lead to weird result
and should be filtered out.

Checking the Secure bit of the calling MSR ensure that the call is coming
from either the Ultravisor or a SVM. But any system call made from a SVM
are going through the Ultravisor, and the Ultravisor should filter out
these malicious call. This way, only the Ultravisor is able to make such a
Hcall.

Cc: Bharata B Rao <bharata@linux.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarLaurent Dufour <ldufour@linux.ibm.com>
Reviewed-by: default avatarRam Pai <linuxram@us.ibnm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 9bee484b
...@@ -1073,24 +1073,34 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu) ...@@ -1073,24 +1073,34 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)
kvmppc_get_gpr(vcpu, 6)); kvmppc_get_gpr(vcpu, 6));
break; break;
case H_SVM_PAGE_IN: case H_SVM_PAGE_IN:
ret = H_UNSUPPORTED;
if (kvmppc_get_srr1(vcpu) & MSR_S)
ret = kvmppc_h_svm_page_in(vcpu->kvm, ret = kvmppc_h_svm_page_in(vcpu->kvm,
kvmppc_get_gpr(vcpu, 4), kvmppc_get_gpr(vcpu, 4),
kvmppc_get_gpr(vcpu, 5), kvmppc_get_gpr(vcpu, 5),
kvmppc_get_gpr(vcpu, 6)); kvmppc_get_gpr(vcpu, 6));
break; break;
case H_SVM_PAGE_OUT: case H_SVM_PAGE_OUT:
ret = H_UNSUPPORTED;
if (kvmppc_get_srr1(vcpu) & MSR_S)
ret = kvmppc_h_svm_page_out(vcpu->kvm, ret = kvmppc_h_svm_page_out(vcpu->kvm,
kvmppc_get_gpr(vcpu, 4), kvmppc_get_gpr(vcpu, 4),
kvmppc_get_gpr(vcpu, 5), kvmppc_get_gpr(vcpu, 5),
kvmppc_get_gpr(vcpu, 6)); kvmppc_get_gpr(vcpu, 6));
break; break;
case H_SVM_INIT_START: case H_SVM_INIT_START:
ret = H_UNSUPPORTED;
if (kvmppc_get_srr1(vcpu) & MSR_S)
ret = kvmppc_h_svm_init_start(vcpu->kvm); ret = kvmppc_h_svm_init_start(vcpu->kvm);
break; break;
case H_SVM_INIT_DONE: case H_SVM_INIT_DONE:
ret = H_UNSUPPORTED;
if (kvmppc_get_srr1(vcpu) & MSR_S)
ret = kvmppc_h_svm_init_done(vcpu->kvm); ret = kvmppc_h_svm_init_done(vcpu->kvm);
break; break;
case H_SVM_INIT_ABORT: case H_SVM_INIT_ABORT:
ret = H_UNSUPPORTED;
if (kvmppc_get_srr1(vcpu) & MSR_S)
ret = kvmppc_h_svm_init_abort(vcpu->kvm); ret = kvmppc_h_svm_init_abort(vcpu->kvm);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment