Merge v5.3-rc1 into drm-misc-next

[linux.git] / fs / select.c

diff --git a/fs/select.c b/fs/select.c
index 57712c3c1d91ee219d2dd7fb5feff96522943587..53a0c149f528391a51b9644e3bf99a5cc4b4f3cd 100644 (file)
--- a/fs/select.c
+++ b/fs/select.c
@@ -294,12 +294,14 @@ enum poll_time_type {
        PT_OLD_TIMESPEC = 3,
 };
 
-static int poll_select_copy_remaining(struct timespec64 *end_time,
-                                     void __user *p,
-                                     enum poll_time_type pt_type, int ret)
+static int poll_select_finish(struct timespec64 *end_time,
+                             void __user *p,
+                             enum poll_time_type pt_type, int ret)
 {
        struct timespec64 rts;
 
+       restore_saved_sigmask_unless(ret == -ERESTARTNOHAND);
+
        if (!p)
                return ret;
 
@@ -714,9 +716,7 @@ static int kern_select(int n, fd_set __user *inp, fd_set __user *outp,
        }
 
        ret = core_sys_select(n, inp, outp, exp, to);
-       ret = poll_select_copy_remaining(&end_time, tvp, PT_TIMEVAL, ret);
-
-       return ret;
+       return poll_select_finish(&end_time, tvp, PT_TIMEVAL, ret);
 }
 
 SYSCALL_DEFINE5(select, int, n, fd_set __user *, inp, fd_set __user *, outp,
@@ -757,10 +757,7 @@ static long do_pselect(int n, fd_set __user *inp, fd_set __user *outp,
                return ret;
 
        ret = core_sys_select(n, inp, outp, exp, to);
-       restore_saved_sigmask_unless(ret == -ERESTARTNOHAND);
-       ret = poll_select_copy_remaining(&end_time, tsp, type, ret);
-
-       return ret;
+       return poll_select_finish(&end_time, tsp, type, ret);
 }
 
 /*
@@ -964,7 +961,7 @@ static int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
                struct timespec64 *end_time)
 {
        struct poll_wqueues table;
-       int err = -EFAULT, fdcount, len, size;
+       int err = -EFAULT, fdcount, len;
        /* Allocate small arguments on the stack to save memory and be
           faster - use long to make sure the buffer is aligned properly
           on 64 bit archs to avoid unaligned access */
@@ -992,8 +989,8 @@ static int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
                        break;
 
                len = min(todo, POLLFD_PER_PAGE);
-               size = sizeof(struct poll_list) + sizeof(struct pollfd) * len;
-               walk = walk->next = kmalloc(size, GFP_KERNEL);
+               walk = walk->next = kmalloc(struct_size(walk, entries, len),
+                                           GFP_KERNEL);
                if (!walk) {
                        err = -ENOMEM;
                        goto out_fds;
@@ -1102,10 +1099,7 @@ SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds, unsigned int, nfds,
                return ret;
 
        ret = do_sys_poll(ufds, nfds, to);
-       restore_saved_sigmask_unless(ret == -ERESTARTNOHAND);
-       ret = poll_select_copy_remaining(&end_time, tsp, PT_TIMESPEC, ret);
-
-       return ret;
+       return poll_select_finish(&end_time, tsp, PT_TIMESPEC, ret);
 }
 
 #if defined(CONFIG_COMPAT_32BIT_TIME) && !defined(CONFIG_64BIT)
@@ -1131,10 +1125,7 @@ SYSCALL_DEFINE5(ppoll_time32, struct pollfd __user *, ufds, unsigned int, nfds,
                return ret;
 
        ret = do_sys_poll(ufds, nfds, to);
-       restore_saved_sigmask_unless(ret == -ERESTARTNOHAND);
-       ret = poll_select_copy_remaining(&end_time, tsp, PT_OLD_TIMESPEC, ret);
-
-       return ret;
+       return poll_select_finish(&end_time, tsp, PT_OLD_TIMESPEC, ret);
 }
 #endif
 
@@ -1271,9 +1262,7 @@ static int do_compat_select(int n, compat_ulong_t __user *inp,
        }
 
        ret = compat_core_sys_select(n, inp, outp, exp, to);
-       ret = poll_select_copy_remaining(&end_time, tvp, PT_OLD_TIMEVAL, ret);
-
-       return ret;
+       return poll_select_finish(&end_time, tvp, PT_OLD_TIMEVAL, ret);
 }
 
 COMPAT_SYSCALL_DEFINE5(select, int, n, compat_ulong_t __user *, inp,
@@ -1333,10 +1322,7 @@ static long do_compat_pselect(int n, compat_ulong_t __user *inp,
                return ret;
 
        ret = compat_core_sys_select(n, inp, outp, exp, to);
-       restore_saved_sigmask_unless(ret == -ERESTARTNOHAND);
-       ret = poll_select_copy_remaining(&end_time, tsp, type, ret);
-
-       return ret;
+       return poll_select_finish(&end_time, tsp, type, ret);
 }
 
 COMPAT_SYSCALL_DEFINE6(pselect6_time64, int, n, compat_ulong_t __user *, inp,
@@ -1405,10 +1391,7 @@ COMPAT_SYSCALL_DEFINE5(ppoll_time32, struct pollfd __user *, ufds,
                return ret;
 
        ret = do_sys_poll(ufds, nfds, to);
-       restore_saved_sigmask_unless(ret == -ERESTARTNOHAND);
-       ret = poll_select_copy_remaining(&end_time, tsp, PT_OLD_TIMESPEC, ret);
-
-       return ret;
+       return poll_select_finish(&end_time, tsp, PT_OLD_TIMESPEC, ret);
 }
 #endif
 
@@ -1434,10 +1417,7 @@ COMPAT_SYSCALL_DEFINE5(ppoll_time64, struct pollfd __user *, ufds,
                return ret;
 
        ret = do_sys_poll(ufds, nfds, to);
-       restore_saved_sigmask_unless(ret == -ERESTARTNOHAND);
-       ret = poll_select_copy_remaining(&end_time, tsp, PT_TIMESPEC, ret);
-
-       return ret;
+       return poll_select_finish(&end_time, tsp, PT_TIMESPEC, ret);
 }
 
 #endif