openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

io_uring: make sure openat/openat2 honor rlimit nofile 

Dmitry reports that a test case shows that io_uring isn't honoring a
modified rlimit nofile setting. get_unused_fd_flags() checks the task
signal->rlimi[] for the limits. As this isn't easily inheritable,
provide a __get_unused_fd_flags() that takes the value instead. Then we
can grab it when the request is prepared (from the original task), and
pass that in when we do the async part part of the open.

Reported-by: Dmitry Kadashev <dkadashev@gmail.com>
Tested-by: Dmitry Kadashev <dkadashev@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2020-03-19 19:23:18 -06:00
parent f1d96a8fcb
commit 4022e7af86
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/file.c
View File

@ -540,9 +540,14 @@ static int alloc_fd(unsigned start, unsigned flags)
return __alloc_fd(current->files, start, rlimit(RLIMIT_NOFILE), flags); return __alloc_fd(current->files, start, rlimit(RLIMIT_NOFILE), flags);
} }
int __get_unused_fd_flags(unsigned flags, unsigned long nofile)
{
return __alloc_fd(current->files, 0, nofile, flags);
}
int get_unused_fd_flags(unsigned flags) int get_unused_fd_flags(unsigned flags)
{ {
return __alloc_fd(current->files, 0, rlimit(RLIMIT_NOFILE), flags); return __get_unused_fd_flags(flags, rlimit(RLIMIT_NOFILE));
} }
EXPORT_SYMBOL(get_unused_fd_flags); EXPORT_SYMBOL(get_unused_fd_flags);

5
fs/io_uring.c
View File

@ -397,6 +397,7 @@ struct io_open {
struct filename *filename; struct filename *filename;
struct statx __user *buffer; struct statx __user *buffer;
struct open_how how; struct open_how how;
unsigned long nofile;
}; };
struct io_files_update { struct io_files_update {
@ -2577,6 +2578,7 @@ static int io_openat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
return ret; return ret;
} }
req->open.nofile = rlimit(RLIMIT_NOFILE);
req->flags |= REQ_F_NEED_CLEANUP; req->flags |= REQ_F_NEED_CLEANUP;
return 0; return 0;
} }
@ -2618,6 +2620,7 @@ static int io_openat2_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
return ret; return ret;
} }
req->open.nofile = rlimit(RLIMIT_NOFILE);
req->flags |= REQ_F_NEED_CLEANUP; req->flags |= REQ_F_NEED_CLEANUP;
return 0; return 0;
} }
@ -2636,7 +2639,7 @@ static int io_openat2(struct io_kiocb *req, struct io_kiocb **nxt,
if (ret) if (ret)
goto err; goto err;
ret = get_unused_fd_flags(req->open.how.flags); ret = __get_unused_fd_flags(req->open.how.flags, req->open.nofile);
if (ret < 0) if (ret < 0)
goto err; goto err;

1
include/linux/file.h
View File

@ -85,6 +85,7 @@ extern int f_dupfd(unsigned int from, struct file *file, unsigned flags);
extern int replace_fd(unsigned fd, struct file *file, unsigned flags); extern int replace_fd(unsigned fd, struct file *file, unsigned flags);
extern void set_close_on_exec(unsigned int fd, int flag); extern void set_close_on_exec(unsigned int fd, int flag);
extern bool get_close_on_exec(unsigned int fd); extern bool get_close_on_exec(unsigned int fd);
extern int __get_unused_fd_flags(unsigned flags, unsigned long nofile);
extern int get_unused_fd_flags(unsigned flags); extern int get_unused_fd_flags(unsigned flags);
extern void put_unused_fd(unsigned int fd); extern void put_unused_fd(unsigned int fd);