take rlimit check to callers of expand_files()

... except for one in android, where the check is different
and already done in caller.  No need to recalculate rlimit
many times in alloc_fd() either.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 3 insertions, 0 deletions

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 887b5ba8c9b5..08e6af5c1b1f 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -64,6 +64,9 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
         if (unlikely(oldfd == newfd))
                 return -EINVAL;
 
+        if (newfd >= rlimit(RLIMIT_NOFILE))
+                return -EMFILE;
+
         spin_lock(&files->file_lock);
         err = expand_files(files, newfd);
         file = fcheck(oldfd);