Signed-off-by: Christian Brauner --- mm/secretmem.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/mm/secretmem.c b/mm/secretmem.c index 60137305bc20..b3cd9a33f68e 100644 --- a/mm/secretmem.c +++ b/mm/secretmem.c @@ -224,8 +224,7 @@ static struct file *secretmem_file_create(unsigned long flags) SYSCALL_DEFINE1(memfd_secret, unsigned int, flags) { - struct file *file; - int fd, err; + int err; /* make sure local flags do not confict with global fcntl.h */ BUILD_BUG_ON(SECRETMEM_FLAGS_MASK & O_CLOEXEC); @@ -238,22 +237,12 @@ SYSCALL_DEFINE1(memfd_secret, unsigned int, flags) if (atomic_read(&secretmem_users) < 0) return -ENFILE; - fd = get_unused_fd_flags(flags & O_CLOEXEC); - if (fd < 0) - return fd; - - file = secretmem_file_create(flags); - if (IS_ERR(file)) { - err = PTR_ERR(file); - goto err_put_fd; - } - - fd_install(fd, file); - return fd; + FD_PREPARE(fdf, flags & O_CLOEXEC, secretmem_file_create(flags)); + err = ACQUIRE_ERR(fd_prepare, &fdf); + if (err) + return err; -err_put_fd: - put_unused_fd(fd); - return err; + return fd_publish(fdf); } static int secretmem_init_fs_context(struct fs_context *fc) -- 2.47.3