Skip to content

Commit 4667d63

Browse files
committed
net/socket: convert __sys_accept4_file() to FD_ADD()
Link: https://patch.msgid.link/20251123-work-fd-prepare-v4-31-b6efa1706cfd@kernel.org Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 245f0d1 commit 4667d63

1 file changed

Lines changed: 1 addition & 14 deletions

File tree

net/socket.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2003,27 +2003,14 @@ static int __sys_accept4_file(struct file *file, struct sockaddr __user *upeer_s
20032003
int __user *upeer_addrlen, int flags)
20042004
{
20052005
struct proto_accept_arg arg = { };
2006-
struct file *newfile;
2007-
int newfd;
20082006

20092007
if (flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK))
20102008
return -EINVAL;
20112009

20122010
if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
20132011
flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
20142012

2015-
newfd = get_unused_fd_flags(flags);
2016-
if (unlikely(newfd < 0))
2017-
return newfd;
2018-
2019-
newfile = do_accept(file, &arg, upeer_sockaddr, upeer_addrlen,
2020-
flags);
2021-
if (IS_ERR(newfile)) {
2022-
put_unused_fd(newfd);
2023-
return PTR_ERR(newfile);
2024-
}
2025-
fd_install(newfd, newfile);
2026-
return newfd;
2013+
return FD_ADD(flags, do_accept(file, &arg, upeer_sockaddr, upeer_addrlen, flags));
20272014
}
20282015

20292016
/*

0 commit comments

Comments
 (0)