diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-08-25 15:37:00 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-08-25 15:37:00 +0200 |
| commit | 7cd4b90a737e2e6f41be4ac8b1df847fec67f3da (patch) | |
| tree | 920abb10e0c1279eaf256eaec4d6fbd386ab9ac2 /arch/s390/kvm | |
| parent | 7b46268d29543e313e731606d845e65c17f232e4 (diff) | |
| parent | ab3f285f227fec62868037e9b1b1fd18294a83b8 (diff) | |
| download | op-kernel-dev-7cd4b90a737e2e6f41be4ac8b1df847fec67f3da.zip op-kernel-dev-7cd4b90a737e2e6f41be4ac8b1df847fec67f3da.tar.gz | |
Merge tag 'kvm-s390-20140825' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
Here are two fixes for s390 KVM code that prevent:
1. a malicious user to trigger a kernel BUG
2. a malicious user to change the storage key of read-only pages
Diffstat (limited to 'arch/s390/kvm')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index a3c324e..197bec0 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -1321,19 +1321,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) return -EINVAL; } - switch (kvm_run->exit_reason) { - case KVM_EXIT_S390_SIEIC: - case KVM_EXIT_UNKNOWN: - case KVM_EXIT_INTR: - case KVM_EXIT_S390_RESET: - case KVM_EXIT_S390_UCONTROL: - case KVM_EXIT_S390_TSCH: - case KVM_EXIT_DEBUG: - break; - default: - BUG(); - } - vcpu->arch.sie_block->gpsw.mask = kvm_run->psw_mask; vcpu->arch.sie_block->gpsw.addr = kvm_run->psw_addr; if (kvm_run->kvm_dirty_regs & KVM_SYNC_PREFIX) { |
