From: Christian Brauner <brauner@kernel.org>
Date: Sun, 23 Nov 2025 16:33:37 +0000 (+0100)
Subject: af_unix: convert unix_file_open() to FD_ADD()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7352c6fce34c2e3d902a9bb0af1684c535805e08;p=thirdparty%2Flinux.git

af_unix: convert unix_file_open() to FD_ADD()

Link: https://patch.msgid.link/20251123-work-fd-prepare-v4-19-b6efa1706cfd@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
---

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 768098dec2310..afe2d17fe6945 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -3286,9 +3286,6 @@ EXPORT_SYMBOL_GPL(unix_outq_len);
 
 static int unix_open_file(struct sock *sk)
 {
-	struct file *f;
-	int fd;
-
 	if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN))
 		return -EPERM;
 
@@ -3298,18 +3295,7 @@ static int unix_open_file(struct sock *sk)
 	if (!unix_sk(sk)->path.dentry)
 		return -ENOENT;
 
-	fd = get_unused_fd_flags(O_CLOEXEC);
-	if (fd < 0)
-		return fd;
-
-	f = dentry_open(&unix_sk(sk)->path, O_PATH, current_cred());
-	if (IS_ERR(f)) {
-		put_unused_fd(fd);
-		return PTR_ERR(f);
-	}
-
-	fd_install(fd, f);
-	return fd;
+	return FD_ADD(O_CLOEXEC, dentry_open(&unix_sk(sk)->path, O_PATH, current_cred()));
 }
 
 static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)