Commit f33ff992 authored by Al Viro's avatar Al Viro

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 352e3b24
...@@ -64,6 +64,9 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags) ...@@ -64,6 +64,9 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
if (unlikely(oldfd == newfd)) if (unlikely(oldfd == newfd))
return -EINVAL; return -EINVAL;
if (newfd >= rlimit(RLIMIT_NOFILE))
return -EMFILE;
spin_lock(&files->file_lock); spin_lock(&files->file_lock);
err = expand_files(files, newfd); err = expand_files(files, newfd);
file = fcheck(oldfd); file = fcheck(oldfd);
......
...@@ -251,13 +251,6 @@ int expand_files(struct files_struct *files, int nr) ...@@ -251,13 +251,6 @@ int expand_files(struct files_struct *files, int nr)
fdt = files_fdtable(files); fdt = files_fdtable(files);
/*
* N.B. For clone tasks sharing a files structure, this test
* will limit the total number of files that can be opened.
*/
if (nr >= rlimit(RLIMIT_NOFILE))
return -EMFILE;
/* Do we need to expand? */ /* Do we need to expand? */
if (nr < fdt->max_fds) if (nr < fdt->max_fds)
return 0; return 0;
...@@ -431,6 +424,7 @@ int alloc_fd(unsigned start, unsigned flags) ...@@ -431,6 +424,7 @@ int alloc_fd(unsigned start, unsigned flags)
{ {
struct files_struct *files = current->files; struct files_struct *files = current->files;
unsigned int fd; unsigned int fd;
unsigned end = rlimit(RLIMIT_NOFILE);
int error; int error;
struct fdtable *fdt; struct fdtable *fdt;
...@@ -444,6 +438,14 @@ int alloc_fd(unsigned start, unsigned flags) ...@@ -444,6 +438,14 @@ int alloc_fd(unsigned start, unsigned flags)
if (fd < fdt->max_fds) if (fd < fdt->max_fds)
fd = find_next_zero_bit(fdt->open_fds, fdt->max_fds, fd); fd = find_next_zero_bit(fdt->open_fds, fdt->max_fds, fd);
/*
* N.B. For clone tasks sharing a files structure, this test
* will limit the total number of files that can be opened.
*/
error = -EMFILE;
if (fd >= end)
goto out;
error = expand_files(files, fd); error = expand_files(files, fd);
if (error < 0) if (error < 0)
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment