Commit 09a93c1d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kvm-s390-kernel-access' from emailed bundle 

Pull s390 kvm fix from Christian Borntraeger:
 "Add missing check for the MEMOP ioctl

  The SIDA MEMOPs must only be used for secure guests, otherwise
  userspace can do unwanted memory accesses"

* tag 'kvm-s390-kernel-access' from emailed bundle:
  KVM: s390: Return error on SIDA memop on normal guest
parents e6251ab4 2c212e1b

arch/s390/kvm/kvm-s390.c

+2 −0
Original line number Diff line number Diff line
@@ -4667,6 +4667,8 @@ static long kvm_s390_guest_sida_op(struct kvm_vcpu *vcpu, 
		return -EINVAL;

	if (mop->size + mop->sida_offset > sida_size(vcpu->arch.sie_block))

		return -E2BIG;

	if (!kvm_s390_pv_cpu_is_protected(vcpu))

		return -EINVAL;



	switch (mop->op) {

	case KVM_S390_MEMOP_SIDA_READ: