summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2020-07-25 21:49:36 +0200
committerIngo Molnar <mingo@kernel.org>2020-07-25 21:49:36 +0200
commitc84d53051fcb4f3d14d5a245e1d7ee8512bcb199 (patch)
tree30f7f845afc8e0428c1fbb1bc93f52b120d40661 /virt
parent9a71df495c3d29dab596bb590e73fd8b20106e2d (diff)
parentba47d845d715a010f7b51f6f89bae32845e6acb7 (diff)
downloadlinux-c84d53051fcb4f3d14d5a245e1d7ee8512bcb199.tar.bz2
Merge tag 'v5.8-rc6' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c3
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