Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89a1d43e authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge tag 'kvm-s390-master-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux 

KVM: s390: Fixes for 4.8 (via kvm/master)

Here are two fixes found by fuzzing of the ioctl interface.
Both cases can trigger a WARN_ON_ONCE from user space.
parents 9b731bcf aca411a4

arch/s390/kvm/kvm-s390.c

+4 −1
Original line number Diff line number Diff line
@@ -1672,6 +1672,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 
				    KVM_SYNC_CRS |

				    KVM_SYNC_ARCH0 |

				    KVM_SYNC_PFAULT;

	kvm_s390_set_prefix(vcpu, 0);

	if (test_kvm_facility(vcpu->kvm, 64))

		vcpu->run->kvm_valid_regs |= KVM_SYNC_RICCB;

	/* fprs can be synchronized via vrs, even if the guest has no vx. With
@@ -2361,8 +2362,10 @@ static int kvm_s390_handle_requests(struct kvm_vcpu *vcpu) 
		rc = gmap_mprotect_notify(vcpu->arch.gmap,

					  kvm_s390_get_prefix(vcpu),

					  PAGE_SIZE * 2, PROT_WRITE);

		if (rc)

		if (rc) {

			kvm_make_request(KVM_REQ_MMU_RELOAD, vcpu);

			return rc;

		}

		goto retry;

	}