diff options
| author | Paolo Bonzini | 2024-01-08 08:09:57 -0500 |
|---|---|---|
| committer | Paolo Bonzini | 2024-01-08 08:09:57 -0500 |
| commit | fb872da8e720f8281dde01b8929419eb5ae6b033 (patch) | |
| tree | ebd9be9500f7cfd550fcae98a321f66abdc3d944 /arch/s390 | |
| parent | 5f53d88f10eb07de0a9bf50e6ad21982e48fd3e3 (diff) | |
| parent | 1f829359c8c37f77a340575957686ca8c4bca317 (diff) | |
Merge tag 'kvm-x86-generic-6.8' of https://github.com/kvm-x86/linux into HEAD
Common KVM changes for 6.8:
- Use memdup_array_user() to harden against overflow.
- Unconditionally advertise KVM_CAP_DEVICE_CTRL for all architectures.
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kvm/guestdbg.c | 4 | ||||
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/s390/kvm/guestdbg.c b/arch/s390/kvm/guestdbg.c index 3765c4223bf9..80879fc73c90 100644 --- a/arch/s390/kvm/guestdbg.c +++ b/arch/s390/kvm/guestdbg.c @@ -213,8 +213,8 @@ int kvm_s390_import_bp_data(struct kvm_vcpu *vcpu, else if (dbg->arch.nr_hw_bp > MAX_BP_COUNT) return -EINVAL; - bp_data = memdup_user(dbg->arch.hw_bp, - sizeof(*bp_data) * dbg->arch.nr_hw_bp); + bp_data = memdup_array_user(dbg->arch.hw_bp, dbg->arch.nr_hw_bp, + sizeof(*bp_data)); if (IS_ERR(bp_data)) return PTR_ERR(bp_data); diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 7aa0e668488f..39463d0e4a1c 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -563,7 +563,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) case KVM_CAP_ENABLE_CAP: case KVM_CAP_S390_CSS_SUPPORT: case KVM_CAP_IOEVENTFD: - case KVM_CAP_DEVICE_CTRL: case KVM_CAP_S390_IRQCHIP: case KVM_CAP_VM_ATTRIBUTES: case KVM_CAP_MP_STATE: |