diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2024-01-08 14:09:57 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-01-08 14:09:57 +0100 |
commit | fb872da8e720f8281dde01b8929419eb5ae6b033 (patch) | |
tree | ebd9be9500f7cfd550fcae98a321f66abdc3d944 /arch/powerpc/kvm | |
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.xz 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/powerpc/kvm')
-rw-r--r-- | arch/powerpc/kvm/powerpc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index c3f82e238b70..23407fbd73c9 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -528,7 +528,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) case KVM_CAP_ENABLE_CAP: case KVM_CAP_ONE_REG: case KVM_CAP_IOEVENTFD: - case KVM_CAP_DEVICE_CTRL: case KVM_CAP_IMMEDIATE_EXIT: case KVM_CAP_SET_GUEST_DEBUG: r = 1; |