diff options
| author | Paul Mackerras <paulus@samba.org> | 2014-09-02 16:14:43 +1000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-09-22 10:11:34 +0200 |
| commit | 9333e6c4c15a4084dd5f4336cd4379afbf99e458 (patch) | |
| tree | d4c481c68d9d776bac8398be769d553f5662831c | |
| parent | b754c739ee8cd0101dc3f5a24e8c2ff76ee7eff9 (diff) | |
| download | blackbird-op-linux-9333e6c4c15a4084dd5f4336cd4379afbf99e458.tar.gz blackbird-op-linux-9333e6c4c15a4084dd5f4336cd4379afbf99e458.zip | |
KVM: PPC: Book3S HV: Only accept host PVR value for guest PVR
Since the guest can read the machine's PVR (Processor Version Register)
directly and see the real value, we should disallow userspace from
setting any value for the guest's PVR other than the real host value.
Therefore this makes kvm_arch_vcpu_set_sregs_hv() check the supplied
PVR value and return an error if it is different from the host value,
which has been put into vcpu->arch.pvr at vcpu creation time.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 4526befd60c5..529d10a7a36f 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -856,7 +856,9 @@ static int kvm_arch_vcpu_ioctl_set_sregs_hv(struct kvm_vcpu *vcpu, { int i, j; - kvmppc_set_pvr_hv(vcpu, sregs->pvr); + /* Only accept the same PVR as the host's, since we can't spoof it */ + if (sregs->pvr != vcpu->arch.pvr) + return -EINVAL; j = 0; for (i = 0; i < vcpu->arch.slb_nr; i++) { |
