Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-fixes

[linux.git] / fs / signalfd.c

diff --git a/fs/signalfd.c b/fs/signalfd.c
index 1c667af86da52f8aa2ad5820b64997f884193604..5f1ff8756595ee93bd9a13e3a3531a6a937f5d32 100644 (file)
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -313,15 +313,13 @@ COMPAT_SYSCALL_DEFINE4(signalfd4, int, ufd,
                     compat_size_t, sigsetsize,
                     int, flags)
 {
-       compat_sigset_t ss32;
        sigset_t tmp;
        sigset_t __user *ksigmask;
 
        if (sigsetsize != sizeof(compat_sigset_t))
                return -EINVAL;
-       if (copy_from_user(&ss32, sigmask, sizeof(ss32)))
+       if (get_compat_sigset(&tmp, sigmask))
                return -EFAULT;
-       sigset_from_compat(&tmp, &ss32);
        ksigmask = compat_alloc_user_space(sizeof(sigset_t));
        if (copy_to_user(ksigmask, &tmp, sizeof(sigset_t)))
                return -EFAULT;