Skip to content

Commit 09a93c1

Browse files
committed
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
2 parents e6251ab + 2c212e1 commit 09a93c1

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

arch/s390/kvm/kvm-s390.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4667,6 +4667,8 @@ static long kvm_s390_guest_sida_op(struct kvm_vcpu *vcpu,
46674667
return -EINVAL;
46684668
if (mop->size + mop->sida_offset > sida_size(vcpu->arch.sie_block))
46694669
return -E2BIG;
4670+
if (!kvm_s390_pv_cpu_is_protected(vcpu))
4671+
return -EINVAL;
46704672

46714673
switch (mop->op) {
46724674
case KVM_S390_MEMOP_SIDA_READ:

0 commit comments

Comments
 (0)