diff options
author | Michael Mueller <mimu@linux.vnet.ibm.com> | 2015-02-26 06:12:40 -0500 |
---|---|---|
committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2015-03-04 04:33:24 -0500 |
commit | 94422ee880afc4af050bac172ea39af8e2130034 (patch) | |
tree | 82bcadedadd9306a299b59a3c0de05786192b43d /arch/s390 | |
parent | 86044c8c14b618b11558d3cba96aa0548c81274d (diff) |
KVM: s390: fix in memory copy of facility lists
The facility lists were not fully copied.
Signed-off-by: Michael Mueller <mimu@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/kvm/kvm-s390.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 18965f91d39e..76894c8db4d7 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c | |||
@@ -579,7 +579,7 @@ static int kvm_s390_get_machine(struct kvm *kvm, struct kvm_device_attr *attr) | |||
579 | memcpy(&mach->fac_mask, kvm_s390_fac_list_mask, | 579 | memcpy(&mach->fac_mask, kvm_s390_fac_list_mask, |
580 | kvm_s390_fac_list_mask_size() * sizeof(u64)); | 580 | kvm_s390_fac_list_mask_size() * sizeof(u64)); |
581 | memcpy((unsigned long *)&mach->fac_list, S390_lowcore.stfle_fac_list, | 581 | memcpy((unsigned long *)&mach->fac_list, S390_lowcore.stfle_fac_list, |
582 | S390_ARCH_FAC_LIST_SIZE_U64); | 582 | S390_ARCH_FAC_LIST_SIZE_BYTE); |
583 | if (copy_to_user((void __user *)attr->addr, mach, sizeof(*mach))) | 583 | if (copy_to_user((void __user *)attr->addr, mach, sizeof(*mach))) |
584 | ret = -EFAULT; | 584 | ret = -EFAULT; |
585 | kfree(mach); | 585 | kfree(mach); |
@@ -903,7 +903,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) | |||
903 | goto out_nofac; | 903 | goto out_nofac; |
904 | 904 | ||
905 | memcpy(kvm->arch.model.fac->kvm, S390_lowcore.stfle_fac_list, | 905 | memcpy(kvm->arch.model.fac->kvm, S390_lowcore.stfle_fac_list, |
906 | S390_ARCH_FAC_LIST_SIZE_U64); | 906 | S390_ARCH_FAC_LIST_SIZE_BYTE); |
907 | 907 | ||
908 | /* | 908 | /* |
909 | * If this KVM host runs *not* in a LPAR, relax the facility bits | 909 | * If this KVM host runs *not* in a LPAR, relax the facility bits |