diff options
Diffstat (limited to 'fs/file.c')
-rw-r--r-- | fs/file.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/file.c b/fs/file.c index 0d4ec0fa23b3..07e25f1b9dfd 100644 --- a/fs/file.c +++ b/fs/file.c @@ -538,9 +538,9 @@ out: return error; } -static int alloc_fd(unsigned start, unsigned flags) +static int alloc_fd(unsigned start, unsigned end, unsigned flags) { - return __alloc_fd(current->files, start, rlimit(RLIMIT_NOFILE), flags); + return __alloc_fd(current->files, start, end, flags); } int __get_unused_fd_flags(unsigned flags, unsigned long nofile) @@ -1175,10 +1175,11 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes) int f_dupfd(unsigned int from, struct file *file, unsigned flags) { + unsigned long nofile = rlimit(RLIMIT_NOFILE); int err; - if (from >= rlimit(RLIMIT_NOFILE)) + if (from >= nofile) return -EINVAL; - err = alloc_fd(from, flags); + err = alloc_fd(from, nofile, flags); if (err >= 0) { get_file(file); fd_install(err, file); |