diff options
| author | Christian Brauner <brauner@kernel.org> | 2025-11-23 17:33:43 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-11-28 12:42:34 +0100 |
| commit | 1afcbbe5d65617a3f2f6338effa9e0f21082912b (patch) | |
| tree | beb1807e3be31359690cd3fa1d48bff932dea9bd /mm/memfd.c | |
| parent | 981bec8f698ba19a4d983016c6ccdde30502d07e (diff) | |
memfd: convert memfd_create() to FD_ADD()
Link: https://patch.msgid.link/20251123-work-fd-prepare-v4-25-b6efa1706cfd@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'mm/memfd.c')
| -rw-r--r-- | mm/memfd.c | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/mm/memfd.c b/mm/memfd.c index 1d109c1acf21..2a6614b7c4ea 100644 --- a/mm/memfd.c +++ b/mm/memfd.c @@ -470,9 +470,9 @@ SYSCALL_DEFINE2(memfd_create, const char __user *, uname, unsigned int, flags) { - struct file *file; - int fd, error; - char *name; + char *name __free(kfree) = NULL; + unsigned int fd_flags; + int error; error = sanitize_flags(&flags); if (error < 0) @@ -482,25 +482,6 @@ SYSCALL_DEFINE2(memfd_create, if (IS_ERR(name)) return PTR_ERR(name); - fd = get_unused_fd_flags((flags & MFD_CLOEXEC) ? O_CLOEXEC : 0); - if (fd < 0) { - error = fd; - goto err_free_name; - } - - file = alloc_file(name, flags); - if (IS_ERR(file)) { - error = PTR_ERR(file); - goto err_free_fd; - } - - fd_install(fd, file); - kfree(name); - return fd; - -err_free_fd: - put_unused_fd(fd); -err_free_name: - kfree(name); - return error; + fd_flags = (flags & MFD_CLOEXEC) ? O_CLOEXEC : 0; + return FD_ADD(fd_flags, alloc_file(name, flags)); } |