diff options
| author |  Paolo Bonzini <pbonzini@redhat.com>
| 2024-01-08 08:09:57 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com>
| 2024-01-08 08:09:57 -0500 |
| commit | fb872da8e720f8281dde01b8929419eb5ae6b033 (patch) | |
| tree | ebd9be9500f7cfd550fcae98a321f66abdc3d944 /arch/x86 | |
| parent | Merge tag 'kvmarm-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmar... (diff) | |
| parent | KVM: Harden copying of userspace-array against overflow (diff) | |
| download | linux-fb872da8e720f8281dde01b8929419eb5ae6b033.tar.gz linux-fb872da8e720f8281dde01b8929419eb5ae6b033.tar.bz2 linux-fb872da8e720f8281dde01b8929419eb5ae6b033.zip | |
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/x86')
| -rw-r--r-- | arch/x86/kvm/cpuid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index dda6fc4cfae8..ad441f0d2917 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -469,7 +469,7 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, return -E2BIG; if (cpuid->nent) { - e = vmemdup_user(entries, array_size(sizeof(*e), cpuid->nent)); + e = vmemdup_array_user(entries, cpuid->nent, sizeof(*e)); if (IS_ERR(e)) return PTR_ERR(e); @@ -513,7 +513,7 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, return -E2BIG; if (cpuid->nent) { - e2 = vmemdup_user(entries, array_size(sizeof(*e2), cpuid->nent)); + e2 = vmemdup_array_user(entries, cpuid->nent, sizeof(*e2)); if (IS_ERR(e2)) return PTR_ERR(e2); } |