diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-03-19 20:16:56 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-03-20 08:48:36 -0600 |
| commit | 09952e3e7826119ddd4357c453d54bcc7ef25156 (patch) | |
| tree | 19e373248dd2c3db726505ff186de50f2d99b6cd /net/socket.c | |
| parent | 4022e7af86be2dd62975dedb6b7ea551d108695e (diff) | |
| download | linux-09952e3e7826119ddd4357c453d54bcc7ef25156.tar.gz linux-09952e3e7826119ddd4357c453d54bcc7ef25156.tar.bz2 linux-09952e3e7826119ddd4357c453d54bcc7ef25156.zip | |
io_uring: make sure accept honor rlimit nofile
Just like commit 4022e7af86be, this fixes the fact that
IORING_OP_ACCEPT ends up using get_unused_fd_flags(), which checks
current->signal->rlim[] for limits.
Add an extra argument to __sys_accept4_file() that allows us to pass
in the proper nofile limit, and grab it at request prep time.
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/socket.c b/net/socket.c index b79a05de7c6e..2eecf1517f76 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1707,7 +1707,8 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog) int __sys_accept4_file(struct file *file, unsigned file_flags, struct sockaddr __user *upeer_sockaddr, - int __user *upeer_addrlen, int flags) + int __user *upeer_addrlen, int flags, + unsigned long nofile) { struct socket *sock, *newsock; struct file *newfile; @@ -1738,7 +1739,7 @@ int __sys_accept4_file(struct file *file, unsigned file_flags, */ __module_get(newsock->ops->owner); - newfd = get_unused_fd_flags(flags); + newfd = __get_unused_fd_flags(flags, nofile); if (unlikely(newfd < 0)) { err = newfd; sock_release(newsock); @@ -1807,7 +1808,8 @@ int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, f = fdget(fd); if (f.file) { ret = __sys_accept4_file(f.file, 0, upeer_sockaddr, - upeer_addrlen, flags); + upeer_addrlen, flags, + rlimit(RLIMIT_NOFILE)); if (f.flags) fput(f.file); } |