Copying bitmaps from/to 64-bit arrays with bitmap_copy is not safe on 32-bit BE machines. Use designated functions instead.
Unified · Split
| @@ -1332,8 +1332,7 @@ static int kvm_s390_set_processor_feat(struct kvm *kvm, · 1331 unmodified lines | |||
| 1332 | mutex_unlock(&kvm->lock); | 1332 | mutex_unlock(&kvm->lock); |
| 1333 | return -EBUSY; | 1333 | return -EBUSY; |
| 1334 | } | 1334 | } |
| 1335 | bitmap_copy(kvm->arch.cpu_feat, (unsigned long *) data.feat, | 1335 | bitmap_from_arr64(kvm->arch.cpu_feat, data.feat, KVM_S390_VM_CPU_FEAT_NR_BITS); |
| 1336 | KVM_S390_VM_CPU_FEAT_NR_BITS); | ||
| 1337 | mutex_unlock(&kvm->lock); | 1336 | mutex_unlock(&kvm->lock); |
| 1338 | VM_EVENT(kvm, 3, "SET: guest feat: 0x%16.16llx.0x%16.16llx.0x%16.16llx", | 1337 | VM_EVENT(kvm, 3, "SET: guest feat: 0x%16.16llx.0x%16.16llx.0x%16.16llx", |
| 1339 | data.feat[0], | 1338 | data.feat[0], |
| @@ -1504,8 +1503,7 @@ static int kvm_s390_get_processor_feat(struct kvm *kvm, · 164 unmodified lines | |||
| 1504 | { | 1503 | { |
| 1505 | struct kvm_s390_vm_cpu_feat data; | 1504 | struct kvm_s390_vm_cpu_feat data; |
| 1506 | 1505 | ||
| 1507 | bitmap_copy((unsigned long *) data.feat, kvm->arch.cpu_feat, | 1506 | bitmap_to_arr64(data.feat, kvm->arch.cpu_feat, KVM_S390_VM_CPU_FEAT_NR_BITS); |
| 1508 | KVM_S390_VM_CPU_FEAT_NR_BITS); | ||
| 1509 | if (copy_to_user((void __user *)attr->addr, &data, sizeof(data))) | 1507 | if (copy_to_user((void __user *)attr->addr, &data, sizeof(data))) |
| 1510 | return -EFAULT; | 1508 | return -EFAULT; |
| 1511 | VM_EVENT(kvm, 3, "GET: guest feat: 0x%16.16llx.0x%16.16llx.0x%16.16llx", | 1509 | VM_EVENT(kvm, 3, "GET: guest feat: 0x%16.16llx.0x%16.16llx.0x%16.16llx", |
| @@ -1520,9 +1518,7 @@ static int kvm_s390_get_machine_feat(struct kvm *kvm, · 8 unmodified lines | |||
| 1520 | { | 1518 | { |
| 1521 | struct kvm_s390_vm_cpu_feat data; | 1519 | struct kvm_s390_vm_cpu_feat data; |
| 1522 | 1520 | ||
| 1523 | bitmap_copy((unsigned long *) data.feat, | 1521 | bitmap_to_arr64(data.feat, kvm_s390_available_cpu_feat, KVM_S390_VM_CPU_FEAT_NR_BITS); |
| 1524 | kvm_s390_available_cpu_feat, | ||
| 1525 | KVM_S390_VM_CPU_FEAT_NR_BITS); | ||
| 1526 | if (copy_to_user((void __user *)attr->addr, &data, sizeof(data))) | 1522 | if (copy_to_user((void __user *)attr->addr, &data, sizeof(data))) |
| 1527 | return -EFAULT; | 1523 | return -EFAULT; |
| 1528 | VM_EVENT(kvm, 3, "GET: host feat: 0x%16.16llx.0x%16.16llx.0x%16.16llx", | 1524 | VM_EVENT(kvm, 3, "GET: host feat: 0x%16.16llx.0x%16.16llx.0x%16.16llx", |