diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2020-07-08 16:20:38 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-07-08 16:20:38 -0400 |
commit | 6c6165f83ba7cee1997303115ffea9d5aa646188 (patch) | |
tree | e14c01354e5a141cc44fedae571314957e785ca3 /virt | |
parent | 26d05b368a5c0a4e12da527fab98903a204bdc88 (diff) | |
parent | 8038a922cf9af5266eaff29ce996a0d1b788fc0d (diff) |
Merge branch 'kvm-master' into HEAD
Merge 5.8-rc bugfixes.
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/kvm_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index a852af5c3214..0a68c9d3d3ab 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -3350,7 +3350,8 @@ static long kvm_vcpu_compat_ioctl(struct file *filp, if (kvm_sigmask.len != sizeof(compat_sigset_t)) goto out; r = -EFAULT; - if (get_compat_sigset(&sigset, (void *)sigmask_arg->sigset)) + if (get_compat_sigset(&sigset, + (compat_sigset_t __user *)sigmask_arg->sigset)) goto out; r = kvm_vcpu_ioctl_set_sigmask(vcpu, &sigset); } else |