diff options
author | Radim Krčmář | 2017-12-06 15:55:44 +0100 |
---|---|---|
committer | Radim Krčmář | 2017-12-06 15:55:44 +0100 |
commit | d29899a30f987de46bcdab3ca4513de2479629e5 (patch) | |
tree | 58869cb489ae91c13b77f2b4ff93fda835fd1405 /arch/s390/kvm/kvm-s390.c | |
parent | KVM: VMX: fix page leak in hardware_setup() (diff) | |
parent | KVM: s390: Fix skey emulation permission check (diff) | |
download | kernel-qcow2-linux-d29899a30f987de46bcdab3ca4513de2479629e5.tar.gz kernel-qcow2-linux-d29899a30f987de46bcdab3ca4513de2479629e5.tar.xz kernel-qcow2-linux-d29899a30f987de46bcdab3ca4513de2479629e5.zip |
Merge tag 'kvm-s390-master-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
KVM: s390: Fixes for 4.15
- SPDX tags
- Fence storage key accesses from problem state
- Make sure that irq_state.flags is not used in the future
Diffstat (limited to 'arch/s390/kvm/kvm-s390.c')
-rw-r--r-- | arch/s390/kvm/kvm-s390.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 9614aea5839b..ec8b68e97d3c 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* - * hosting zSeries kernel virtual machines + * hosting IBM Z kernel virtual machines (s390x) * - * Copyright IBM Corp. 2008, 2009 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License (version 2 only) - * as published by the Free Software Foundation. + * Copyright IBM Corp. 2008, 2017 * * Author(s): Carsten Otte <cotte@de.ibm.com> * Christian Borntraeger <borntraeger@de.ibm.com> @@ -3808,6 +3805,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp, r = -EINVAL; break; } + /* do not use irq_state.flags, it will break old QEMUs */ r = kvm_s390_set_irq_state(vcpu, (void __user *) irq_state.buf, irq_state.len); @@ -3823,6 +3821,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp, r = -EINVAL; break; } + /* do not use irq_state.flags, it will break old QEMUs */ r = kvm_s390_get_irq_state(vcpu, (__u8 __user *) irq_state.buf, irq_state.len); |