superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

secretmem: convert memfd_secret() to FD_ADD() 

Link: https://patch.msgid.link/20251123-work-fd-prepare-v4-26-b6efa1706cfd@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
pull/1354/merge
Christian Brauner 2025-11-23 17:33:44 +01:00
parent 1afcbbe5d6
commit 910c361f9a
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mm/secretmem.c
View File

@ -224,9 +224,6 @@ err_free_inode:
SYSCALL_DEFINE1(memfd_secret, unsigned int, flags) SYSCALL_DEFINE1(memfd_secret, unsigned int, flags)
{ {
struct file *file;
int fd, err;
/* make sure local flags do not confict with global fcntl.h */ /* make sure local flags do not confict with global fcntl.h */
BUILD_BUG_ON(SECRETMEM_FLAGS_MASK & O_CLOEXEC); BUILD_BUG_ON(SECRETMEM_FLAGS_MASK & O_CLOEXEC);
@ -238,22 +235,7 @@ SYSCALL_DEFINE1(memfd_secret, unsigned int, flags)
if (atomic_read(&secretmem_users) < 0) if (atomic_read(&secretmem_users) < 0)
return -ENFILE; return -ENFILE;
fd = get_unused_fd_flags(flags & O_CLOEXEC); return FD_ADD(flags & O_CLOEXEC, secretmem_file_create(flags));
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;
err_put_fd:
put_unused_fd(fd);
return err;
} }
static int secretmem_init_fs_context(struct fs_context *fc) static int secretmem_init_fs_context(struct fs_context *fc)