Merge branch 'misc.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull compat and uaccess updates from Al Viro:

 - {get,put}_compat_sigset() series

 - assorted compat ioctl stuff

 - more set_fs() elimination

 - a few more timespec64 conversions

 - several removals of pointless access_ok() in places where it was
   followed only by non-__ variants of primitives

* 'misc.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (24 commits)
  coredump: call do_unlinkat directly instead of sys_unlink
  fs: expose do_unlinkat for built-in callers
  ext4: take handling of EXT4_IOC_GROUP_ADD into a helper, get rid of set_fs()
  ipmi: get rid of pointless access_ok()
  pi433: sanitize ioctl
  cxlflash: get rid of pointless access_ok()
  mtdchar: get rid of pointless access_ok()
  r128: switch compat ioctls to drm_ioctl_kernel()
  selection: get rid of field-by-field copyin
  VT_RESIZEX: get rid of field-by-field copyin
  i2c compat ioctls: move to ->compat_ioctl()
  sched_rr_get_interval(): move compat to native, get rid of set_fs()
  mips: switch to {get,put}_compat_sigset()
  sparc: switch to {get,put}_compat_sigset()
  s390: switch to {get,put}_compat_sigset()
  ppc: switch to {get,put}_compat_sigset()
  parisc: switch to {get,put}_compat_sigset()
  get_compat_sigset()
  get rid of {get,put}_compat_itimerspec()
  io_getevents: Use timespec64 to represent timeouts
  ...

1 files changed, 2 insertions, 5 deletions

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 2dd1a9ca4599..f169ecc4f2e8 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2724,7 +2724,6 @@ static long kvm_vcpu_compat_ioctl(struct file *filp,
         case KVM_SET_SIGNAL_MASK: {
                 struct kvm_signal_mask __user *sigmask_arg = argp;
                 struct kvm_signal_mask kvm_sigmask;
-                compat_sigset_t csigset;
                 sigset_t sigset;
 
                 if (argp) {
@@ -2733,13 +2732,11 @@ static long kvm_vcpu_compat_ioctl(struct file *filp,
                                            sizeof(kvm_sigmask)))
                                 goto out;
                         r = -EINVAL;
-                        if (kvm_sigmask.len != sizeof(csigset))
+                        if (kvm_sigmask.len != sizeof(compat_sigset_t))
                                 goto out;
                         r = -EFAULT;
-                        if (copy_from_user(&csigset, sigmask_arg->sigset,
-                                           sizeof(csigset)))
+                        if (get_compat_sigset(&sigset, (void *)sigmask_arg->sigset))
                                 goto out;
-                        sigset_from_compat(&sigset, &csigset);
                         r = kvm_vcpu_ioctl_set_sigmask(vcpu, &sigset);
                 } else
                         r = kvm_vcpu_ioctl_set_sigmask(vcpu, NULL);