summaryrefslogtreecommitdiff
path: root/fs/open.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-07-26 16:01:20 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2008-07-26 20:53:45 -0400
commit4e1e018ecc6f7bfd10fc75b3ff9715cc8164e0a2 (patch)
tree75404b1269b079a327551f76a9b3f941f5b11a77 /fs/open.c
parent6c5d0512a091480c9f981162227fdb1c9d70e555 (diff)
downloadlwn-4e1e018ecc6f7bfd10fc75b3ff9715cc8164e0a2.tar.gz
lwn-4e1e018ecc6f7bfd10fc75b3ff9715cc8164e0a2.zip
[PATCH] fix RLIM_NOFILE handling
* dup2() should return -EBADF on exceeded sysctl_nr_open * dup() should *not* return -EINVAL even if you have rlimit set to 0; it should get -EMFILE instead. Check for orig_start exceeding rlimit taken to sys_fcntl(). Failing expand_files() in dup{2,3}() now gets -EMFILE remapped to -EBADF. Consequently, remaining checks for rlimit are taken to expand_files(). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/open.c')
-rw-r--r--fs/open.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/open.c b/fs/open.c
index 3fe1a6857c75..52647be277a2 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -972,7 +972,6 @@ int get_unused_fd_flags(int flags)
int fd, error;
struct fdtable *fdt;
- error = -EMFILE;
spin_lock(&files->file_lock);
repeat:
@@ -980,13 +979,6 @@ repeat:
fd = find_next_zero_bit(fdt->open_fds->fds_bits, fdt->max_fds,
files->next_fd);
- /*
- * N.B. For clone tasks sharing a files structure, this test
- * will limit the total number of files that can be opened.
- */
- if (fd >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
- goto out;
-
/* Do we need to expand the fd array or fd set? */
error = expand_files(files, fd);
if (error < 0)
@@ -997,7 +989,6 @@ repeat:
* If we needed to expand the fs array we
* might have blocked - try again.
*/
- error = -EMFILE;
goto repeat;
}