From: Christian Brauner <brauner@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>, Jan Kara <jack@suse.cz>,
linux-fsdevel@vger.kernel.org, Jeff Layton <jlayton@kernel.org>,
Amir Goldstein <amir73il@gmail.com>,
Jens Axboe <axboe@kernel.dk>,
Christian Brauner <brauner@kernel.org>
Subject: [PATCH v4 22/47] ipc: convert do_mq_open() to FD_PREPARE()
Date: Sun, 23 Nov 2025 17:33:40 +0100 [thread overview]
Message-ID: <20251123-work-fd-prepare-v4-22-b6efa1706cfd@kernel.org> (raw)
In-Reply-To: <20251123-work-fd-prepare-v4-0-b6efa1706cfd@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
---
ipc/mqueue.c | 31 +++++++++----------------------
1 file changed, 9 insertions(+), 22 deletions(-)
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 093551fe66a7..8b9b53db67a2 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -899,7 +899,7 @@ static int do_mq_open(const char __user *u_name, int oflag, umode_t mode,
struct dentry *root = mnt->mnt_root;
struct filename *name;
struct path path;
- int fd, error;
+ int ret;
int ro;
audit_mq_open(oflag, mode, attr);
@@ -908,38 +908,25 @@ static int do_mq_open(const char __user *u_name, int oflag, umode_t mode,
if (IS_ERR(name))
return PTR_ERR(name);
- fd = get_unused_fd_flags(O_CLOEXEC);
- if (fd < 0)
- goto out_putname;
-
ro = mnt_want_write(mnt); /* we'll drop it in any case */
inode_lock(d_inode(root));
path.dentry = lookup_noperm(&QSTR(name->name), root);
if (IS_ERR(path.dentry)) {
- error = PTR_ERR(path.dentry);
- goto out_putfd;
+ ret = PTR_ERR(path.dentry);
+ goto out_unlock;
}
path.mnt = mntget(mnt);
- error = prepare_open(path.dentry, oflag, ro, mode, name, attr);
- if (!error) {
- struct file *file = dentry_open(&path, oflag, current_cred());
- if (!IS_ERR(file))
- fd_install(fd, file);
- else
- error = PTR_ERR(file);
- }
+ ret = prepare_open(path.dentry, oflag, ro, mode, name, attr);
+ if (!ret)
+ ret = FD_ADD(O_CLOEXEC, dentry_open(&path, oflag, current_cred()));
path_put(&path);
-out_putfd:
- if (error) {
- put_unused_fd(fd);
- fd = error;
- }
+
+out_unlock:
inode_unlock(d_inode(root));
if (!ro)
mnt_drop_write(mnt);
-out_putname:
putname(name);
- return fd;
+ return ret;
}
SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, umode_t, mode,
--
2.47.3
next prev parent reply other threads:[~2025-11-23 16:34 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-23 16:33 [PATCH v4 00/47] file: FD_{ADD,PREPARE}() Christian Brauner
2025-11-23 16:33 ` [PATCH v4 01/47] file: add FD_{ADD,PREPARE}() Christian Brauner
2025-11-24 15:03 ` Jason Gunthorpe
2025-11-23 16:33 ` [PATCH v4 02/47] anon_inodes: convert to FD_PREPARE() Christian Brauner
2025-11-25 12:16 ` Jan Kara
2025-11-23 16:33 ` [PATCH v4 03/47] eventfd: convert do_eventfd() " Christian Brauner
2025-11-25 12:18 ` Jan Kara
2025-11-23 16:33 ` [PATCH v4 04/47] fhandle: convert do_handle_open() " Christian Brauner
2025-11-25 12:15 ` Jan Kara
2025-11-23 16:33 ` [PATCH v4 05/47] namespace: convert open_tree() " Christian Brauner
2025-11-25 12:32 ` Jan Kara
2025-11-23 16:33 ` [PATCH v4 06/47] namespace: convert open_tree_attr() " Christian Brauner
2025-11-25 12:33 ` Jan Kara
2025-11-23 16:33 ` [PATCH v4 07/47] namespace: convert fsmount() " Christian Brauner
2025-11-25 12:42 ` Jan Kara
2025-11-23 16:33 ` [PATCH v4 08/47] fanotify: convert fanotify_init() " Christian Brauner
2025-11-24 17:13 ` Amir Goldstein
2025-11-25 12:13 ` Jan Kara
2025-11-23 16:33 ` [PATCH v4 09/47] nsfs: convert open_namespace() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 10/47] nsfs: convert ns_ioctl() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 11/47] autofs: convert autofs_dev_ioctl_open_mountpoint() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 12/47] eventpoll: convert do_epoll_create() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 13/47] open: convert do_sys_openat2() " Christian Brauner
2025-11-25 12:20 ` Jan Kara
2025-11-23 16:33 ` [PATCH v4 14/47] signalfd: convert do_signalfd4() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 15/47] timerfd: convert timerfd_create() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 16/47] userfaultfd: convert new_userfaultfd() " Christian Brauner
2025-11-25 11:24 ` Mike Rapoport
2025-11-23 16:33 ` [PATCH v4 17/47] xfs: convert xfs_open_by_handle() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 18/47] dma: convert dma_buf_fd() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 19/47] af_unix: convert unix_file_open() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 20/47] dma: convert sync_file_ioctl_merge() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 21/47] exec: convert begin_new_exec() " Christian Brauner
2025-11-23 16:33 ` Christian Brauner [this message]
2025-11-25 22:30 ` [PATCH v4 22/47] ipc: convert do_mq_open() " Mark Brown
2025-11-26 0:05 ` Linus Torvalds
2025-11-26 13:20 ` Christian Brauner
2025-11-26 16:10 ` Linus Torvalds
2025-11-23 16:33 ` [PATCH v4 23/47] bpf: convert bpf_iter_new_fd() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 24/47] bpf: convert bpf_token_create() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 25/47] memfd: convert memfd_create() " Christian Brauner
2025-11-25 11:30 ` Mike Rapoport
2025-11-23 16:33 ` [PATCH v4 26/47] secretmem: convert memfd_secret() " Christian Brauner
2025-11-25 11:21 ` Mike Rapoport
2025-11-23 16:33 ` [PATCH v4 27/47] net/handshake: convert handshake_nl_accept_doit() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 28/47] net/kcm: convert kcm_ioctl() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 29/47] net/sctp: convert sctp_getsockopt_peeloff_common() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 30/47] net/socket: convert sock_map_fd() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 31/47] net/socket: convert __sys_accept4_file() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 32/47] spufs: convert spufs_context_open() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 33/47] papr-hvpipe: convert papr_hvpipe_dev_create_handle() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 34/47] spufs: convert spufs_gang_open() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 35/47] pseries: convert papr_platform_dump_create_handle() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 36/47] pseries: port papr_rtas_setup_file_interface() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 37/47] dma: port sw_sync_ioctl_create_fence() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 38/47] gpio: convert linehandle_create() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 39/47] hv: convert mshv_ioctl_create_partition() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 40/47] media: convert media_request_alloc() " Christian Brauner
2025-11-23 16:33 ` [PATCH v4 41/47] ntsync: convert ntsync_obj_get_fd() " Christian Brauner
2025-11-23 16:34 ` [PATCH v4 42/47] tty: convert ptm_open_peer() " Christian Brauner
2025-11-25 22:39 ` Mark Brown
2025-11-26 13:35 ` Christian Brauner
2025-11-26 14:22 ` Mark Brown
2025-11-23 16:34 ` [PATCH v4 43/47] vfio: convert vfio_group_ioctl_get_device_fd() " Christian Brauner
2025-11-24 14:52 ` Jason Gunthorpe
2025-11-23 16:34 ` [PATCH v4 44/47] file: convert replace_fd() " Christian Brauner
2025-11-25 12:29 ` Jan Kara
2025-11-23 16:34 ` [PATCH v4 45/47] io_uring: convert io_create_mock_file() " Christian Brauner
2025-11-25 16:38 ` Jens Axboe
2025-11-23 16:34 ` [PATCH v4 46/47] kvm: convert kvm_arch_supports_gmem_init_shared() " Christian Brauner
2025-11-23 16:34 ` [PATCH v4 47/47] kvm: convert kvm_vcpu_ioctl_get_stats_fd() " Christian Brauner
2025-11-23 16:43 ` [PATCH v4 00/47] file: FD_{ADD,PREPARE}() Linus Torvalds
2025-11-23 16:46 ` Linus Torvalds
2025-11-23 22:53 ` Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251123-work-fd-prepare-v4-22-b6efa1706cfd@kernel.org \
--to=brauner@kernel.org \
--cc=amir73il@gmail.com \
--cc=axboe@kernel.dk \
--cc=jack@suse.cz \
--cc=jlayton@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.